Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
sgm0422
2017-08-28 17:06:13 +08:00
parent cdc0fb9707 57e31b1daf
commit c81685eaec
145 changed files with 889 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+3 -5
View File
@@ -249,9 +249,7 @@ class commonModel extends model
echo "<li class='divider'></li>";
}
$isLeft = ($app->company->website and $app->company->backyard) ? '' : ' left';
echo "<li class='dropdown-submenu{$isLeft}'>";
echo "<li class='dropdown-submenu left'>";
echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu'>";
foreach ($app->lang->themes as $key => $value)
{
@@ -259,7 +257,7 @@ class commonModel extends model
}
echo '</ul></li>';
echo "<li class='dropdown-submenu{$isLeft}'>";
echo "<li class='dropdown-submenu left'>";
echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu'>";
foreach ($app->config->langs as $key => $value)
{
@@ -1132,7 +1130,7 @@ class commonModel extends model
global $app, $lang;
/* Check is the super admin or not. */
if($app->user->admin) return true;
if(!empty($app->user->admin)) return true;
/* If not super admin, check the rights. */
$rights = $app->user->rights['rights'];