allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

Some fixes

This commit is contained in:
Matteo Gheza 2020-08-31 18:33:50 +02:00
parent 607b31437e
commit 393cd91865
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core.php
View File

@ -371,7 +371,7 @@ class user{
}
public function requireRole($role, $adminGranted=true){
return $this->auth->hasRole($role) || $this->auth->hasRole(Role::SUPER_ADMIN) || ($this->auth->hasRole(Role::ADMIN) && $adminGranted);
return $this->auth->hasRole($role) || $this->auth->hasRole(Role::SUPER_ADMIN) || ($this->auth->hasRole(Role::ADMIN) && $adminGranted && $role !== Role::DEVELOPER);
}
public function name($replace=false){

2
server/risorse/ajax/ajax_lista.php
View File

@ -44,7 +44,7 @@ th, td {
<th><?php t("Available"); ?></th>
<?php
foreach($risultato as $row){
if(!in_array($row['name'], $hidden)){
if(!in_array($row['name'], $hidden) && ($row['hidden'] == 0 && $row['disabled'] == 0)){
echo "<tr><td>";
if ($row['caposquadra'] == 1) {echo "<img src='./risorse/images/cascoRosso.png' width='20px'> ";} else{echo "<img src='./risorse/images/cascoNero.png' width='20px'> ";}
if($row['online'] == 1){