From 51f170c9855e25883ca6194321ba308eff57c8e0 Mon Sep 17 00:00:00 2001
From: Bertrand GAUTHIER <bertrand.gauthier@unicaen.fr>
Date: Wed, 8 Dec 2021 12:22:22 +0100
Subject: [PATCH] =?UTF-8?q?Retour=20en=20arri=C3=A8re=20suite=20=C3=A0=20l?=
=?UTF-8?q?'abandon=20des=20modifs=20envisag=C3=A9es=20sur=20unicaen/auth?=
=?UTF-8?q?=20(trop=20compliqu=C3=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/module.config.php | 10 +++++-----
src/UnicaenDbImport/Privilege/ImportPrivilege.php | 6 ++----
src/UnicaenDbImport/Privilege/LogPrivilege.php | 6 ++----
src/UnicaenDbImport/Privilege/ObservationPrivilege.php | 6 ++----
src/UnicaenDbImport/Privilege/SynchroPrivilege.php | 6 ++----
view/unicaen-db-import/import/index.phtml | 4 ++--
view/unicaen-db-import/import/voir.phtml | 2 +-
view/unicaen-db-import/log/index.phtml | 6 +++---
view/unicaen-db-import/observ/index.phtml | 2 +-
view/unicaen-db-import/synchro/diff.phtml | 2 +-
view/unicaen-db-import/synchro/index.phtml | 4 ++--
view/unicaen-db-import/synchro/voir.phtml | 2 +-
12 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/config/module.config.php b/config/module.config.php
index c97ee20..b8d61eb 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -108,31 +108,31 @@ return [
'unicaen-db-import' => [
'label' => "Import/Synchro",
'route' => 'unicaen-db-import/import',
- 'resource' => ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::LISTER),
+ 'resource' => ImportPrivilege::getResourceId(ImportPrivilege::LISTER),
'order' => 100,
'pages' => [
'import' => [
'label' => "Imports",
'route' => 'unicaen-db-import/import',
- 'resource' => ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::LISTER),
+ 'resource' => ImportPrivilege::getResourceId(ImportPrivilege::LISTER),
'order' => 10,
],
'synchro' => [
'label' => "Synchros",
'route' => 'unicaen-db-import/synchro',
- 'resource' => SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::LISTER),
+ 'resource' => SynchroPrivilege::getResourceId(SynchroPrivilege::LISTER),
'order' => 20,
],
'log' => [
'label' => "Logs",
'route' => 'unicaen-db-import/log',
- 'resource' => LogPrivilege::resourceIdForPrivilege(LogPrivilege::LISTER),
+ 'resource' => LogPrivilege::getResourceId(LogPrivilege::LISTER),
'order' => 30,
],
'observ' => [
'label' => "Observations",
'route' => 'unicaen-db-import/observ',
- 'resource' => ObservationPrivilege::resourceIdForPrivilege(ObservationPrivilege::LISTER),
+ 'resource' => ObservationPrivilege::getResourceId(ObservationPrivilege::LISTER),
'order' => 40,
],
],
diff --git a/src/UnicaenDbImport/Privilege/ImportPrivilege.php b/src/UnicaenDbImport/Privilege/ImportPrivilege.php
index d2d460a..9a8f20f 100644
--- a/src/UnicaenDbImport/Privilege/ImportPrivilege.php
+++ b/src/UnicaenDbImport/Privilege/ImportPrivilege.php
@@ -2,12 +2,10 @@
namespace UnicaenDbImport\Privilege;
-use UnicaenAuth\Provider\Privilege\PrivilegeAsResourceTrait;
+use UnicaenAuth\Provider\Privilege\Privileges;
-class ImportPrivilege
+class ImportPrivilege extends Privileges
{
- use PrivilegeAsResourceTrait;
-
const LISTER = 'unicaen-db-import-import-lister';
const CONSULTER = 'unicaen-db-import-import-consulter';
const LANCER = 'unicaen-db-import-import-lancer';
diff --git a/src/UnicaenDbImport/Privilege/LogPrivilege.php b/src/UnicaenDbImport/Privilege/LogPrivilege.php
index 6397733..ce00e9e 100644
--- a/src/UnicaenDbImport/Privilege/LogPrivilege.php
+++ b/src/UnicaenDbImport/Privilege/LogPrivilege.php
@@ -2,12 +2,10 @@
namespace UnicaenDbImport\Privilege;
-use UnicaenAuth\Provider\Privilege\PrivilegeAsResourceTrait;
+use UnicaenAuth\Provider\Privilege\Privileges;
-class LogPrivilege
+class LogPrivilege extends Privileges
{
- use PrivilegeAsResourceTrait;
-
const LISTER = 'unicaen-db-import-log-lister';
const CONSULTER = 'unicaen-db-import-log-consulter';
}
\ No newline at end of file
diff --git a/src/UnicaenDbImport/Privilege/ObservationPrivilege.php b/src/UnicaenDbImport/Privilege/ObservationPrivilege.php
index 8c011bd..f1a8613 100644
--- a/src/UnicaenDbImport/Privilege/ObservationPrivilege.php
+++ b/src/UnicaenDbImport/Privilege/ObservationPrivilege.php
@@ -2,12 +2,10 @@
namespace UnicaenDbImport\Privilege;
-use UnicaenAuth\Provider\Privilege\PrivilegeAsResourceTrait;
+use UnicaenAuth\Provider\Privilege\Privileges;
-class ObservationPrivilege
+class ObservationPrivilege extends Privileges
{
- use PrivilegeAsResourceTrait;
-
const LISTER = 'unicaen-db-import-observation-lister';
const CONSULTER_RESULTAT = 'unicaen-db-import-observation-consulter-resultat';
}
\ No newline at end of file
diff --git a/src/UnicaenDbImport/Privilege/SynchroPrivilege.php b/src/UnicaenDbImport/Privilege/SynchroPrivilege.php
index fe53a85..b3359fe 100644
--- a/src/UnicaenDbImport/Privilege/SynchroPrivilege.php
+++ b/src/UnicaenDbImport/Privilege/SynchroPrivilege.php
@@ -2,12 +2,10 @@
namespace UnicaenDbImport\Privilege;
-use UnicaenAuth\Provider\Privilege\PrivilegeAsResourceTrait;
+use UnicaenAuth\Provider\Privilege\Privileges;
-class SynchroPrivilege
+class SynchroPrivilege extends Privileges
{
- use PrivilegeAsResourceTrait;
-
const LISTER = 'unicaen-db-import-synchro-lister';
const CONSULTER = 'unicaen-db-import-synchro-consulter';
const LANCER = 'unicaen-db-import-synchro-lancer';
diff --git a/view/unicaen-db-import/import/index.phtml b/view/unicaen-db-import/import/index.phtml
index 11fde9f..b467cef 100644
--- a/view/unicaen-db-import/import/index.phtml
+++ b/view/unicaen-db-import/import/index.phtml
@@ -10,8 +10,8 @@ use UnicaenDbImport\Privilege\ImportPrivilege;
$this->headTitle($this->translate("Imports"));
-$consultable = $this->isAllowed(ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::CONSULTER));
-$lancable = $this->isAllowed(ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::LANCER));
+$consultable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::CONSULTER));
+$lancable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::LANCER));
?>
<h1 class="page-header">
diff --git a/view/unicaen-db-import/import/voir.phtml b/view/unicaen-db-import/import/voir.phtml
index 05efe52..f64bec5 100644
--- a/view/unicaen-db-import/import/voir.phtml
+++ b/view/unicaen-db-import/import/voir.phtml
@@ -11,7 +11,7 @@ use UnicaenDbImport\Privilege\ImportPrivilege;
$this->headTitle($this->translate("Import") . ' ' . $import->getName());
-$lancable = $this->isAllowed(ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::LANCER));
+$lancable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::LANCER));
?>
<h1 class="page-header">
diff --git a/view/unicaen-db-import/log/index.phtml b/view/unicaen-db-import/log/index.phtml
index 8a1eef1..8138c04 100644
--- a/view/unicaen-db-import/log/index.phtml
+++ b/view/unicaen-db-import/log/index.phtml
@@ -12,8 +12,8 @@ use UnicaenDbImport\Privilege\SynchroPrivilege;
$this->headTitle($this->translate("Logs"));
-$importConsultable = $this->isAllowed(ImportPrivilege::resourceIdForPrivilege(ImportPrivilege::CONSULTER));
-$synchroConsultable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::CONSULTER));
+$importConsultable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::CONSULTER));
+$synchroConsultable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::CONSULTER));
?>
<h1 class="page-header">
@@ -85,7 +85,7 @@ $synchroConsultable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(
<span class="fas <?php echo $log->isSuccess() ? 'fa-thumbs-up text-success' : 'fa-thumbs-down text-danger' ?>"></span>
</td>
<td>
- <?php if ($this->isAllowed(LogPrivilege::resourceIdForPrivilege(LogPrivilege::CONSULTER))): ?>
+ <?php if ($this->isAllowed(LogPrivilege::getResourceId(LogPrivilege::CONSULTER))): ?>
<?php
$fullLog = str_replace(PHP_EOL, '<br>', $log->getLog());
$truncLog = mb_strlen($log->getLog()) > 150 ?
diff --git a/view/unicaen-db-import/observ/index.phtml b/view/unicaen-db-import/observ/index.phtml
index e043818..5a2a901 100644
--- a/view/unicaen-db-import/observ/index.phtml
+++ b/view/unicaen-db-import/observ/index.phtml
@@ -10,7 +10,7 @@ use UnicaenDbImport\Privilege\ObservationPrivilege;
$this->headTitle($this->translate("Observations"));
-$resultatConsultable = $this->isAllowed(ObservationPrivilege::resourceIdForPrivilege(ObservationPrivilege::CONSULTER_RESULTAT));
+$resultatConsultable = $this->isAllowed(ObservationPrivilege::getResourceId(ObservationPrivilege::CONSULTER_RESULTAT));
?>
<h1 class="page-header">
diff --git a/view/unicaen-db-import/synchro/diff.phtml b/view/unicaen-db-import/synchro/diff.phtml
index 3f95ac1..7a5f7d6 100644
--- a/view/unicaen-db-import/synchro/diff.phtml
+++ b/view/unicaen-db-import/synchro/diff.phtml
@@ -15,7 +15,7 @@ use UnicaenDbImport\Privilege\SynchroPrivilege;
$this->headTitle($this->translate("Synchro") . ' ' . $synchro->getName());
-$lancable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::LANCER));
+$lancable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::LANCER));
?>
<h1 class="page-header">
diff --git a/view/unicaen-db-import/synchro/index.phtml b/view/unicaen-db-import/synchro/index.phtml
index 1f966b5..412942a 100644
--- a/view/unicaen-db-import/synchro/index.phtml
+++ b/view/unicaen-db-import/synchro/index.phtml
@@ -12,8 +12,8 @@ use UnicaenDbImport\Privilege\SynchroPrivilege;
$this->headTitle($this->translate("Synchros"));
-$consultable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::CONSULTER));
-$lancable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::LANCER));
+$consultable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::CONSULTER));
+$lancable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::LANCER));
?>
<h1 class="page-header">
diff --git a/view/unicaen-db-import/synchro/voir.phtml b/view/unicaen-db-import/synchro/voir.phtml
index 0f97adb..300f512 100644
--- a/view/unicaen-db-import/synchro/voir.phtml
+++ b/view/unicaen-db-import/synchro/voir.phtml
@@ -12,7 +12,7 @@ use UnicaenDbImport\Privilege\SynchroPrivilege;
$this->headTitle($this->translate("Synchro") . ' ' . $synchro->getName());
-$lancable = $this->isAllowed(SynchroPrivilege::resourceIdForPrivilege(SynchroPrivilege::LANCER));
+$lancable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::LANCER));
//$hash = $this->queryParams()[]
?>
--
GitLab