diff --git a/config/module.config.php b/config/module.config.php
index c97ee205a3e26de8c9809fd972ee805061ea40fb..b8d61eb173097ad21b69d672abc33e1011bcb9a3 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 d2d460a31e7c05f607d0644d4f14853c294d0409..9a8f20f8df186241530c3e56113631c2c1951190 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 639773356656b876e03e7fd68db2736d95194f96..ce00e9e48f52344568f29ee1b74e93e3577d6beb 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 8c011bdac6dad3b90eed7de70268872980c7bce3..f1a861381a620deacd9df68c990f3404385db7a7 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 fe53a8508bd7d9b20b8d588fcc520ba23dd4ae9a..b3359fe3907472f1da499952b5a076d4f41b7cc0 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 11fde9f49d77e31c08892feaec92d9fa1bcb7d6c..b467cef188602bad80593bbd655bf10acd84bd67 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 05efe52746fafe9abac2a8166fd10548745feb92..f64bec5d95a21cdf2700e587ef7be8dc835ae923 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 8a1eef15a035438bec0014ff8e51f2ba39a1be6d..8138c040b906653a2e90cc0aae8aee3673d1d973 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 e043818620cff4f99dcf8965f1ec6fdeeaf60d9c..5a2a9012b2a3e7264936091f2a42fd40584004c8 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 3f95ac189fc82dfa8ae94eb0422992926363d4fd..7a5f7d664093836bfdb3ac7729d10ef3ab233a51 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 1f966b530f59e1fe346440126ea295f13755c7b2..412942a9c74e5687a88751aaed3eba8ec9b007c5 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 0f97adbc65fdf05d77ddf2d520700cd5295ced86..300f5126bd7bd1cc2a5591b858adc775aae30b21 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()[]
?>