From 9522deff4e986d6ae5d9c99871a6903e64dd6f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Gerg=C5=91?= Date: Tue, 16 Oct 2018 17:09:41 +0200 Subject: [PATCH] Add filters to log pages (#3815) Credit to @gergo85. Thanks to @petehalverson for octodock to test this with --- .../controllers/accesslogs/config_filter.yaml | 16 ++++++++++++++ .../controllers/accesslogs/config_list.yaml | 4 +++- modules/backend/lang/en/lang.php | 2 ++ modules/backend/lang/hu/lang.php | 2 ++ modules/backend/models/accesslog/columns.yaml | 21 ++++++++++++++----- .../controllers/themelogs/config_filter.yaml | 16 ++++++++++++++ .../controllers/themelogs/config_list.yaml | 2 ++ .../controllers/eventlogs/config_filter.yaml | 10 +++++++++ .../controllers/eventlogs/config_list.yaml | 4 +++- 9 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 modules/backend/controllers/accesslogs/config_filter.yaml create mode 100644 modules/cms/controllers/themelogs/config_filter.yaml create mode 100644 modules/system/controllers/eventlogs/config_filter.yaml diff --git a/modules/backend/controllers/accesslogs/config_filter.yaml b/modules/backend/controllers/accesslogs/config_filter.yaml new file mode 100644 index 000000000..2e35941a0 --- /dev/null +++ b/modules/backend/controllers/accesslogs/config_filter.yaml @@ -0,0 +1,16 @@ +# =================================== +# Filter Scope Definitions +# =================================== + +scopes: + + created_at: + label: backend::lang.access_log.created_at + type: daterange + conditions: created_at >= ':after' AND created_at <= ':before' + + user: + label: backend::lang.access_log.login + modelClass: Backend\Models\User + conditions: user_id in (:filtered) + nameFrom: login diff --git a/modules/backend/controllers/accesslogs/config_list.yaml b/modules/backend/controllers/accesslogs/config_list.yaml index 5d12e4988..c146ba884 100644 --- a/modules/backend/controllers/accesslogs/config_list.yaml +++ b/modules/backend/controllers/accesslogs/config_list.yaml @@ -12,4 +12,6 @@ showSetup: true toolbar: buttons: list_toolbar search: - prompt: backend::lang.list.search_prompt \ No newline at end of file + prompt: backend::lang.list.search_prompt + +filter: config_filter.yaml diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 0dd5ae42f..0e17c1bcb 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -438,7 +438,9 @@ return [ 'hint' => 'This log displays a list of successful sign in attempts by administrators. Records are kept for a total of :days days.', 'menu_label' => 'Access log', 'menu_description' => 'View a list of successful back-end user sign ins.', + 'id' => 'ID', 'created_at' => 'Date & Time', + 'type' => 'Type', 'login' => 'Login', 'ip_address' => 'IP address', 'first_name' => 'First name', diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php index 90f9716dd..44d73d868 100644 --- a/modules/backend/lang/hu/lang.php +++ b/modules/backend/lang/hu/lang.php @@ -437,7 +437,9 @@ return [ 'hint' => 'Ez a napló a felhasználók sikeres bejelentkezési kísérleteit listázza ki. A bejegyzéseket :days napig őrzi meg a rendszer.', 'menu_label' => 'Hozzáférés napló', 'menu_description' => 'A felhasználók sikeres bejelentkezéseinek megtekintése.', + 'id' => 'ID', 'created_at' => 'Időpont', + 'type' => 'Típus', 'login' => 'Felhasználónév', 'ip_address' => 'IP cím', 'first_name' => 'Keresztnév', diff --git a/modules/backend/models/accesslog/columns.yaml b/modules/backend/models/accesslog/columns.yaml index e27e84d59..25d6f20ea 100644 --- a/modules/backend/models/accesslog/columns.yaml +++ b/modules/backend/models/accesslog/columns.yaml @@ -3,12 +3,27 @@ # =================================== columns: + + id: + label: backend::lang.access_log.id + searchable: yes + invisible: true + width: 75px + created_at: label: backend::lang.access_log.created_at searchable: yes type: timetense width: 160px + type: + label: backend::lang.access_log.type + invisible: true + + ip_address: + label: backend::lang.access_log.ip_address + searchable: yes + login: label: backend::lang.access_log.login relation: user @@ -16,10 +31,6 @@ columns: searchable: yes sortable: false - ip_address: - label: backend::lang.access_log.ip_address - searchable: yes - first_name: label: backend::lang.access_log.first_name relation: user @@ -39,4 +50,4 @@ columns: relation: user select: email searchable: yes - sortable: false \ No newline at end of file + sortable: false diff --git a/modules/cms/controllers/themelogs/config_filter.yaml b/modules/cms/controllers/themelogs/config_filter.yaml new file mode 100644 index 000000000..2e35941a0 --- /dev/null +++ b/modules/cms/controllers/themelogs/config_filter.yaml @@ -0,0 +1,16 @@ +# =================================== +# Filter Scope Definitions +# =================================== + +scopes: + + created_at: + label: backend::lang.access_log.created_at + type: daterange + conditions: created_at >= ':after' AND created_at <= ':before' + + user: + label: backend::lang.access_log.login + modelClass: Backend\Models\User + conditions: user_id in (:filtered) + nameFrom: login diff --git a/modules/cms/controllers/themelogs/config_list.yaml b/modules/cms/controllers/themelogs/config_list.yaml index 3e0f85236..f3b019776 100644 --- a/modules/cms/controllers/themelogs/config_list.yaml +++ b/modules/cms/controllers/themelogs/config_list.yaml @@ -18,3 +18,5 @@ toolbar: buttons: list_toolbar search: prompt: backend::lang.list.search_prompt + +filter: config_filter.yaml diff --git a/modules/system/controllers/eventlogs/config_filter.yaml b/modules/system/controllers/eventlogs/config_filter.yaml new file mode 100644 index 000000000..9fab4a56a --- /dev/null +++ b/modules/system/controllers/eventlogs/config_filter.yaml @@ -0,0 +1,10 @@ +# =================================== +# Filter Scope Definitions +# =================================== + +scopes: + + created_at: + label: backend::lang.access_log.created_at + type: daterange + conditions: created_at >= ':after' AND created_at <= ':before' diff --git a/modules/system/controllers/eventlogs/config_list.yaml b/modules/system/controllers/eventlogs/config_list.yaml index 589882b32..c38471bec 100644 --- a/modules/system/controllers/eventlogs/config_list.yaml +++ b/modules/system/controllers/eventlogs/config_list.yaml @@ -14,4 +14,6 @@ showCheckboxes: true toolbar: buttons: list_toolbar search: - prompt: backend::lang.list.search_prompt \ No newline at end of file + prompt: backend::lang.list.search_prompt + +filter: config_filter.yaml