rooty/Qware_core
0
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue #16.

Browse Source
This commit is contained in:
Rooty 2021-04-07 17:53:29 +02:00
parent ec8c698e56
commit 82ca448fc3
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/template/lcube6/object_printing/userprint/userinfo.mxt
View File

@ -1,9 +1,11 @@
<div id="authMenu" class="navbar-right"> <div id="authMenu" class="navbar-right">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="loggedForm" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"><mx:text id="firstName" /> <mx:text id="lastName" /> (<mx:text id="login" />)<span class="fa fa-lg fa-navicon"></span></a> <a class="nav-link dropdown-toggle" id="loggedForm" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"><mx:text id="firstName" /> <mx:text id="lastName" /> (<mx:text id="login" />)<span class="fa fa-lg fa-navicon"></span></a>
<div id="loggedMenu" class="dropdown-menu text-center" aria-labelledby="loggedForm"> <div id="loggedMenu" class="dropdown-menu text-center" aria-labelledby="loggedForm">
<a class="nav-link" mXattribut="href:urlAccount"><span class="fa fa-lg fa-user"></span>Mon Compte</a> <mx:bloc id="blocUrlAccount">
<a class="nav-link" mXattribut="href:disconnectURL"><span class="fa fa-lg fa-sign-out"></span><mx:text id="decon"/></a> <a class="nav-link" mXattribut="href:urlAccount"><span class="fa fa-lg fa-user"></span>Mon Compte</a>
</div> </mx:bloc id="blocUrlAccount">
</li> <a class="nav-link" mXattribut="href:disconnectURL"><span class="fa fa-lg fa-sign-out"></span><mx:text id="decon"/></a>
</div>
</li>
</div> </div>

7
lib/object_printing/userprint/userprint.php
View File

@ -150,14 +150,19 @@ class UserPrint extends Printing
/* création de l'url de l'outil de gestion du compte utilisateur */ /* création de l'url de l'outil de gestion du compte utilisateur */
$tabObjectNode =$this->getObjectSon(eid()); $tabObjectNode =$this->getObjectSon(eid());
$hasUserModif = false;
for ($j=0; $j<count($tabObjectNode);$j++) for ($j=0; $j<count($tabObjectNode);$j++)
{ {
if ($tabObjectNode[$j][0]->getClassName()=="UserModif") if ($tabObjectNode[$j][0]->getClassName()=="UserModif")
{ {
$MaTemplate->MxAttribut("urlAccount", formatUrl($tabObjectNode[$j][1]->getId(), $tabObjectNode[$j][0]->getClassName(), $tabObjectNode[$j][0]->getMethodName(), "", "")); $MaTemplate->MxAttribut("blocUrlAccount".".urlAccount", formatUrl($tabObjectNode[$j][1]->getId(), $tabObjectNode[$j][0]->getClassName(), $tabObjectNode[$j][0]->getMethodName(), "", ""));
$hasUserModif = true;
} }
} }
if(!$hasUserModif)
$MaTemplate->MxBloc("blocUrlAccount", "delete");
/* création de l'url de login */ /* création de l'url de login */
$url =$_SERVER['SCRIPT_NAME']; $url =$_SERVER['SCRIPT_NAME'];
$url.="?system=disconnectSession"; $url.="?system=disconnectSession";

4
lib/system/system_data/permission/permissionmanager.php
View File

@ -96,7 +96,7 @@ class PermissionManager extends Manager
$nodeAvailable=(is_array($nodeAvailable))?$nodeAvailable:""; $nodeAvailable=(is_array($nodeAvailable))?$nodeAvailable:"";
# On ajoute la gestion de cache # On ajoute la gestion de cache
if (DATA_ACCES_CACHE_PERMISSION==true) if (DATA_ACCES_CACHE_PERMISSION)
$tab=$this->LoadFromIdCache($id); $tab=$this->LoadFromIdCache($id);
# Cas l'enregistrement n'existe pas dans la cache # Cas l'enregistrement n'existe pas dans la cache
@ -107,7 +107,7 @@ class PermissionManager extends Manager
$tab=new Permission(); $tab=new Permission();
$tab->doLoad($id, $result); $tab->doLoad($id, $result);
if (DATA_ACCES_CACHE_PERMISSION==true) if (DATA_ACCES_CACHE_PERMISSION)
$this->InsertCache($id, $tab); $this->InsertCache($id, $tab);
} }
return $tab; return $tab;