* Merge code.

This commit is contained in:
Yagami
2021-03-09 16:12:28 +08:00
parent c02b5e3b4a
commit 1b42cb6ff6
7 changed files with 42 additions and 66 deletions
-6
View File
@@ -711,9 +711,6 @@ class commonModel extends model
$subMenu = "<ul class='dropdown-menu'>{$subMenu}</ul>";
}
/* Disable links to more buttons. */
if($menuItem->name == 'other') $link = 'javascript:void(0);';
/* Avoid highlighting the same navigation method at the same time. */
if($currentModule == 'feedback' and $currentMethod == 'admin') $active = '';
if($currentModule == 'product' and $currentMethod == 'browse') $active = '';
@@ -1761,9 +1758,6 @@ EOD;
$module = strtolower($module);
$method = strtolower($method);
/* More menus do not require permission control. */
if($module == 'project' && $method == 'other') return true;
/* Check the parent object is closed. */
if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false;