From 98a1414e1d8fcb090edc6470a514d6538d8314ce Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sat, 15 Mar 2025 11:57:45 -0400 Subject: [PATCH 01/11] add fields definition --- models/log/fields.yaml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/models/log/fields.yaml b/models/log/fields.yaml index 0494e8f..14577dc 100644 --- a/models/log/fields.yaml +++ b/models/log/fields.yaml @@ -5,4 +5,33 @@ fields: id: label: 'winter.sso::lang.models.general.id' - disabled: true + span: left + + created_at: + label: 'winter.sso::lang.models.general.created_at' + type: datepicker + span: auto + + provider: + label: winter.sso::lang.models.log.provider + span: left + + action: + label: winter.sso::lang.models.log.action + span: auto + + ip: + label: winter.sso::lang.models.log.ip + span: left + + provided_id: + label: winter.sso::lang.models.log.provided_id + span: auto + + provided_email: + label: winter.sso::lang.models.log.provided_email + span: left + + user_email: + label: winter.sso::lang.models.log.user + span: auto From a0e372bd858c0ccb1d325d27489d80c080e25191 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sat, 15 Mar 2025 11:58:13 -0400 Subject: [PATCH 02/11] improve list columns --- models/log/columns.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/models/log/columns.yaml b/models/log/columns.yaml index 98a7cb8..14b47d5 100644 --- a/models/log/columns.yaml +++ b/models/log/columns.yaml @@ -18,11 +18,6 @@ columns: type: text searchable: true sortable: true - user_email: - label: winter.sso::lang.models.log.user - type: partial - path: $/winter/sso/models/log/column.user.php - clickable: true ip: label: winter.sso::lang.models.log.ip type: text @@ -39,4 +34,10 @@ columns: type: text sortable: true searchable: true + invisible: false + user_email: + label: winter.sso::lang.models.log.user + type: partial + path: $/winter/sso/models/log/column.user.php + clickable: true invisible: true From 2cd8fc8e9cdacc8ce92e95bdf0f4a2db419b83ab Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sat, 15 Mar 2025 11:58:52 -0400 Subject: [PATCH 03/11] remove logs create action --- controllers/logs/_list_toolbar.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/controllers/logs/_list_toolbar.php b/controllers/logs/_list_toolbar.php index 6248521..6723522 100644 --- a/controllers/logs/_list_toolbar.php +++ b/controllers/logs/_list_toolbar.php @@ -1,10 +1,4 @@
- - trans('winter.sso::lang.models.log.label')])); ?> - - - - - or - -
- - - - - - -

fatalError) ?>

-

- - diff --git a/controllers/logs/index.php b/controllers/logs/index.php deleted file mode 100644 index ea43a36..0000000 --- a/controllers/logs/index.php +++ /dev/null @@ -1 +0,0 @@ -listRender() ?> diff --git a/controllers/logs/preview.php b/controllers/logs/preview.php deleted file mode 100644 index 7546b33..0000000 --- a/controllers/logs/preview.php +++ /dev/null @@ -1,19 +0,0 @@ - -
    -
    • -
  • pageTitle) ?>
    • -
- - -fatalError): ?> - -
- formRenderPreview() ?> -
- - - -

fatalError) ?>

-

- - diff --git a/controllers/logs/update.php b/controllers/logs/update.php deleted file mode 100644 index aa13c28..0000000 --- a/controllers/logs/update.php +++ /dev/null @@ -1,56 +0,0 @@ - -
    -
  • Logs
    • -
  • pageTitle) ?>
    • -
- - -fatalError): ?> - - 'layout']) ?> - -
- formRender() ?> -
- -
-
- - - - - or - -
-
- - - - - -

fatalError) ?>

-

- - From 9dac6203f37b421bd494bf0f95719441d41ac23c Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Sun, 16 Mar 2025 23:59:57 -0600 Subject: [PATCH 06/11] Update controllers/Logs.php --- controllers/Logs.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/Logs.php b/controllers/Logs.php index adae7d6..39a3cde 100644 --- a/controllers/Logs.php +++ b/controllers/Logs.php @@ -33,4 +33,9 @@ public function update($id) { return \Redirect::to($this->actionUrl('preview', $id)); } + + public function create() + { + abort(404); + } } From 291272e3a00f2121e2b7876b6dab5771bec25c5e Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 17 Mar 2025 00:01:01 -0600 Subject: [PATCH 07/11] Disable updating logs --- controllers/Logs.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/Logs.php b/controllers/Logs.php index 39a3cde..4b3c9f1 100644 --- a/controllers/Logs.php +++ b/controllers/Logs.php @@ -33,6 +33,11 @@ public function update($id) { return \Redirect::to($this->actionUrl('preview', $id)); } + + public function update_onSave() + { + abort(404); + } public function create() { From 4fddfd042effe158d0c8a2cb12e2245a202b8703 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Mon, 17 Mar 2025 07:11:54 -0400 Subject: [PATCH 08/11] default to preview action in config_list --- controllers/Logs.php | 2 +- controllers/logs/config_list.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/Logs.php b/controllers/Logs.php index 4b3c9f1..979345c 100644 --- a/controllers/Logs.php +++ b/controllers/Logs.php @@ -31,7 +31,7 @@ public function __construct() public function update($id) { - return \Redirect::to($this->actionUrl('preview', $id)); + abort(404); } public function update_onSave() diff --git a/controllers/logs/config_list.yaml b/controllers/logs/config_list.yaml index fa311fa..f17deed 100644 --- a/controllers/logs/config_list.yaml +++ b/controllers/logs/config_list.yaml @@ -12,7 +12,7 @@ modelClass: Winter\SSO\Models\Log title: 'winter.sso::lang.models.log.label_plural' # Link URL for each record -recordUrl: winter/sso/logs/update/:id +recordUrl: winter/sso/logs/preview/:id # Message to display if the list is empty noRecordsMessage: backend::lang.list.no_records From f9c6c7efec9204ca611dec75d10d1a9356b0a465 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Wed, 19 Mar 2025 06:19:02 -0400 Subject: [PATCH 09/11] hide create/update actions --- controllers/Logs.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/controllers/Logs.php b/controllers/Logs.php index 979345c..45b2952 100644 --- a/controllers/Logs.php +++ b/controllers/Logs.php @@ -19,6 +19,8 @@ class Logs extends Controller \Backend\Behaviors\ListController::class, ]; + public $hiddenActions = ['create', 'update']; + public $requiredPermissions = ['winter.sso.view_logs']; public function __construct() @@ -28,19 +30,4 @@ public function __construct() BackendMenu::setContext('Winter.System', 'system', 'settings'); SettingsManager::setContext('Winter.SSO', 'logs'); } - - public function update($id) - { - abort(404); - } - - public function update_onSave() - { - abort(404); - } - - public function create() - { - abort(404); - } } From a52529caa2465f620714ca3f25dc39a8ffd3e0e0 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Fri, 2 May 2025 21:41:24 -0400 Subject: [PATCH 10/11] add winter 1.2.8 dependency --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 7ddedaa..8b6e6d2 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "source": "https://github.com/wintercms/wn-sso-plugin" }, "require": { + "winter/wn-backend-module": "~1.2.8", "laravel/socialite": "~5.3" } } From 1f92466b83c3745bb98ebd4c59721fc116bc0cf2 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Wed, 23 Jul 2025 09:58:30 -0700 Subject: [PATCH 11/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8b6e6d2..0a60a13 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "source": "https://github.com/wintercms/wn-sso-plugin" }, "require": { - "winter/wn-backend-module": "~1.2.8", + "winter/wn-backend-module": "~1.2.8|dev-develop", "laravel/socialite": "~5.3" } }