Merge pull request #819 from Cristoto/task-233

Added filter period on logs views
NeoRazorX · Jul 18, 2019 · 1b9540a · 1b9540a
2 parents 991372f + 048c085
commit 1b9540a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Core/Controller/ListLogMessage.php b/Core/Controller/ListLogMessage.php
@@ -71,8 +71,7 @@ protected function createCronJobView($name = 'ListCronJob')
         $this->addOrderBy($name, ['date'], 'date');
 
         /// filters
-        $this->addFilterDatePicker($name, 'fromdate', 'from-date', 'date', '>=');
-        $this->addFilterDatePicker($name, 'untildate', 'until-date', 'date', '<=');
+        $this->addFilterPeriod($name, 'date', 'period', 'date');
 
         $plugins = $this->codeModel->all('cronjobs', 'pluginname', 'pluginname');
         $this->addFilterSelect($name, 'pluginname', 'plugin', 'pluginname', $plugins);
@@ -94,6 +93,8 @@ protected function createEmailSentView($name = 'ListEmailSent')
         /// filters
         $users = $this->codeModel->all('users', 'nick', 'nick');
         $this->addFilterSelect($name, 'nick', 'user', 'nick', $users);
+
+        $this->addFilterPeriod($name, 'date', 'period', 'date');
 
         /// settings
         $this->setSettings($name, 'btnNew', false);
@@ -118,12 +119,11 @@ protected function createLogMessageView($name = 'ListLogMessage')
         $this->addFilterAutocomplete($name, 'nick', 'user', 'nick', 'users');
         $this->addFilterAutocomplete($name, 'ip', 'ip', 'ip', 'logs');
 
+        $this->addFilterPeriod($name, 'time', 'period', 'time');
+
         $uris = $this->codeModel->all('logs', 'uri', 'uri');
         $this->addFilterSelect($name, 'url', 'url', 'uri', $uris);
 
-        $this->addFilterDatePicker($name, 'fromdate', 'from-date', 'time', '>=');
-        $this->addFilterDatePicker($name, 'untildate', 'until-date', 'time', '<=');
-
         /// settings
         $this->setSettings($name, 'btnNew', false);
     }