From 35795d22ec1f9840cda7a38a1c6f11d1d43a5a24 Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Sun, 18 Apr 2021 13:07:53 +0200 Subject: [PATCH] Disabled account edit and status in adminUser coordination object for guest account --- data/template/qware/css/main.css | 7 +++++++ .../object_coordination/adminuser/actionadmin.mxt | 2 +- lib/object_coordination/adminuser/adminuser.php | 14 +++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/data/template/qware/css/main.css b/data/template/qware/css/main.css index 27a9b63..d5daac7 100644 --- a/data/template/qware/css/main.css +++ b/data/template/qware/css/main.css @@ -1064,6 +1064,13 @@ form#authSession.form div.input-group-prepend span i.fa{ border: 1px solid #c8c8c8; } +#data div.tab-content.container-fluid div.card.w-100 div.card-body div table.table tbody tr.odd td span a span.isdisabled{ + color: currentColor; + cursor: default; + opacity: 0.5; + text-decoration: none; +} + #tabListNews tr { line-height: 12px; } diff --git a/data/template/qware/object_coordination/adminuser/actionadmin.mxt b/data/template/qware/object_coordination/adminuser/actionadmin.mxt index 0275717..fd51036 100755 --- a/data/template/qware/object_coordination/adminuser/actionadmin.mxt +++ b/data/template/qware/object_coordination/adminuser/actionadmin.mxt @@ -129,7 +129,7 @@ "> - + "> diff --git a/lib/object_coordination/adminuser/adminuser.php b/lib/object_coordination/adminuser/adminuser.php index 6642d08..8c1c782 100755 --- a/lib/object_coordination/adminuser/adminuser.php +++ b/lib/object_coordination/adminuser/adminuser.php @@ -185,15 +185,23 @@ Class AdminUser extends CoordinationObj $currentUser=$tabUser[$i]; $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnUpdate",getMessage("BtnUpdate")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnDelete",getMessage("BtnDelete")); - $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); +// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.del_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_first_name", htmlentitiesconv($currentUser->getFirstName())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_last_name", htmlentitiesconv($currentUser->getLastName())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_login", htmlentitiesconv($currentUser->getLogin())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_mail", htmlentitiesconv($currentUser->getMail())); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vmailto", "mailto:".htmlentitiesconv($currentUser->getMail())); - $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",formatUrl($this->getId(),"AdminUser","execAccountActiveAdmin","",$currentUser->getId())); - $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-success":"toggle-off text-danger" ); + + if( htmlentitiesconv($currentUser->getLogin()) != "Guest" ) + { + $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); + $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",formatUrl($this->getId(),"AdminUser","execAccountActiveAdmin","",$currentUser->getId())); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-success":"toggle-off text-danger" ); + } else { + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-secondary":"toggle-off text-secondary" ); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active_style", " isdisabled" ); + } $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vuser_id", "user".$currentUser->getId()); /* Pour récuperer les libellés */