Skip to content
Snippets Groups Projects
Commit 59a3fbdc authored by Thomas Deuling's avatar Thomas Deuling
Browse files

[TASK] Solve merge conflict in ChangeLog.md

parents 030580f0 09e8ecea
No related branches found
No related tags found
No related merge requests found
Pipeline #217013601 passed
# View-Statistics Change-Log
<<<<<<< HEAD
## 2020-11-17 Release of version 2.0.1
......@@ -11,6 +12,7 @@ Security fix - please update ASAP
## 2020-10-08 Release of version 2.0.0
* [TASK] Move default object type to settings
* [TASK] Migrate the extension for TYPO3 9.5
* [!!!][TASK] Increase length of IP field in the database to accept IPv6 addresses. This changes the database structure.
* [FEATURE] Make tracking user agents and login duration configurable in the extension settings
......
......@@ -335,7 +335,7 @@ class TrackController extends BackendActionController
{
//
// Validate type
$type = 'sys_file';
$type = $this->settings['defaulttype'];
$this->view->assign('typeOptions', $this->getTypeOptions(true));
if($this->request->hasArgument('type')) {
$type = trim($this->request->getArgument('type'));
......
......@@ -20,6 +20,8 @@ config.tx_extbase.persistence.classes {
plugin.tx_viewstatistics {
settings {
defaulttype = sys_file
# This is the type to object configuration
types {
sys_file {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment