Commit 70f49b94 authored by Laurent's avatar Laurent

hotline #108306 fix user group "valid subscription"

parent 40cc2e69
Pipeline #9731 passed with stage
in 44 minutes and 44 seconds
- ticket #108306 : Correction de la prise en compte de la case "abonnement valide" dans les groupes d'utilisateurs
\ No newline at end of file
...@@ -96,7 +96,7 @@ class Class_User_SearchCriteriaValidSubscription extends Class_SearchCriteria_Ab ...@@ -96,7 +96,7 @@ class Class_User_SearchCriteriaValidSubscription extends Class_SearchCriteria_Ab
if (!$this->_should_filter) if (!$this->_should_filter)
return true; return true;
return $model->isValid(); return $model->isAbonnementValid();
} }
......
...@@ -309,7 +309,7 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base ...@@ -309,7 +309,7 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base
$anchors = []; $anchors = [];
foreach(ZendAfi_Auth_Others::getInstance()->getIdentities() as $user) { foreach(ZendAfi_Auth_Others::getInstance()->getIdentities() as $user) {
$user_name = Class_Users::getNomAff($user->getId()); $user_name = $user->getNomAff();
$remove_from_list = $user->isSuperAdmin() $remove_from_list = $user->isSuperAdmin()
? '' ? ''
: $this->view->tagAnchor($this->view->url(['module' => 'opac', : $this->view->tagAnchor($this->view->url(['module' => 'opac',
...@@ -350,8 +350,8 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base ...@@ -350,8 +350,8 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base
protected function _multipleAccounts() { protected function _multipleAccounts() {
$admin = ZendAfi_Auth_Others::getInstance()->getSuperAdminInIdentities(); $admin = ZendAfi_Auth_Others::getInstance()->getSuperAdminInIdentities();
$user = Class_Users::getIdentity(); $user = Class_Users::getIdentity();
$name = Class_Users::getNomAff($admin->getId()); $name = $admin->getNomAff();
$user_name = Class_Users::getNomAff($user->getId()); $user_name = $user->getNomAff();
$user_anchors = [$this->_tag('li', $user_anchors = [$this->_tag('li',
$this->view->tagAnchor($this->view->url(['module' => 'opac', $this->view->tagAnchor($this->view->url(['module' => 'opac',
'controller' => 'auth', 'controller' => 'auth',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment