Adds a refresh button to log pages, minor column tweaks

shinichi81 · Nov 28, 2015 · 30025a6 · 30025a6
1 parent 2ced2f8
commit 30025a6
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 7 deletions.
diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php
@@ -36,4 +36,9 @@ public function __construct()
         BackendMenu::setContext('October.System', 'system', 'settings');
         SettingsManager::setContext('October.Backend', 'access_logs');
     }
+
+    public function index_onRefresh()
+    {
+        return $this->listRefresh();
+    }
 }
diff --git a/modules/backend/controllers/accesslogs/_list_toolbar.htm b/modules/backend/controllers/accesslogs/_list_toolbar.htm
@@ -1,3 +1,9 @@
-<div data-control="toolbar">
-
-</div>
+<div data-control="toolbar" class="loading-indicator-container">
+    <a
+        href="javascript:;"
+        data-request="onRefresh"
+        data-load-indicator="<?= e(trans('backend::lang.list.updating')) ?>"
+        class="btn btn-primary oc-icon-refresh">
+        <?= e(trans('backend::lang.list.refresh')) ?>
+    </a>
+</div>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
@@ -130,6 +130,8 @@
         'pagination' => 'Displayed records: :from-:to of :total',
         'prev_page' => 'Previous page',
         'next_page' => 'Next page',
+        'refresh' => 'Refresh',
+        'updating' => 'Updating...',
         'loading' => 'Loading...',
         'setup_title' => 'List Setup',
         'setup_help' => 'Use checkboxes to select columns you want to see in the list. You can change position of columns by dragging them up or down.',

diff --git a/modules/backend/models/accesslog/columns.yaml b/modules/backend/models/accesslog/columns.yaml
@@ -6,6 +6,8 @@ columns:
     created_at:
         label: backend::lang.access_log.created_at
         searchable: yes
+        type: timetense
+        width: 160px
 
     login:
         label: backend::lang.access_log.login

diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
@@ -40,7 +40,12 @@ public function __construct()
         SettingsManager::setContext('October.System', 'event_logs');
     }
 
-    public function onEmptyLog()
+    public function index_onRefresh()
+    {
+        return $this->listRefresh();
+    }
+
+    public function index_onEmptyLog()
     {
         EventLog::truncate();
         Flash::success(Lang::get('system::lang.event_log.empty_success'));

diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
@@ -40,7 +40,12 @@ public function __construct()
         SettingsManager::setContext('October.System', 'request_logs');
     }
 
-    public function onEmptyLog()
+    public function index_onRefresh()
+    {
+        return $this->listRefresh();
+    }
+
+    public function index_onEmptyLog()
     {
         RequestLog::truncate();
         Flash::success(Lang::get('system::lang.request_log.empty_success'));

diff --git a/modules/system/controllers/eventlogs/_list_toolbar.htm b/modules/system/controllers/eventlogs/_list_toolbar.htm
@@ -1,4 +1,11 @@
 <div data-control="toolbar" class="loading-indicator-container">
+    <a
+        href="javascript:;"
+        data-request="onRefresh"
+        data-load-indicator="<?= e(trans('backend::lang.list.updating')) ?>"
+        class="btn btn-primary oc-icon-refresh">
+        <?= e(trans('backend::lang.list.refresh')) ?>
+    </a>
     <a
         href="javascript:;"
         data-request="onEmptyLog"
@@ -21,4 +28,4 @@
         data-stripe-load-indicator>
         <?= e(trans('backend::lang.list.delete_selected')) ?>
     </button>
-</div>
+</div>
diff --git a/modules/system/controllers/requestlogs/_list_toolbar.htm b/modules/system/controllers/requestlogs/_list_toolbar.htm
@@ -1,4 +1,11 @@
 <div data-control="toolbar" class="loading-indicator-container">
+    <a
+        href="javascript:;"
+        data-request="onRefresh"
+        data-load-indicator="<?= e(trans('backend::lang.list.updating')) ?>"
+        class="btn btn-primary oc-icon-refresh">
+        <?= e(trans('backend::lang.list.refresh')) ?>
+    </a>
     <a
         href="javascript:;"
         data-request="onEmptyLog"
@@ -21,4 +28,4 @@
         data-stripe-load-indicator>
         <?= e(trans('backend::lang.list.delete_selected')) ?>
     </button>
-</div>
+</div>
diff --git a/modules/system/models/eventlog/columns.yaml b/modules/system/models/eventlog/columns.yaml
@@ -6,10 +6,13 @@ columns:
     id:
         label: system::lang.event_log.id
         searchable: yes
+        width: 75px
 
     created_at:
         label: system::lang.event_log.created_at
         searchable: yes
+        width: 160px
+        type: timetense
 
     message:
         label: system::lang.event_log.message

diff --git a/modules/system/models/requestlog/columns.yaml b/modules/system/models/requestlog/columns.yaml
@@ -6,6 +6,7 @@ columns:
     status_code:
         label: system::lang.request_log.status_code
         searchable: yes
+        width: 100px
 
     url:
         label: system::lang.request_log.url
@@ -14,3 +15,4 @@ columns:
 
     count:
         label: system::lang.request_log.count
+        width: 150px