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

Merge branch 'master_xieqiyu_6959' into 'master'

Browse Source 
* Fix bug#6959.

See merge request easycorp/zentaopms!2939
This commit is contained in:
孙广明
2022-04-14 08:59:30 +00:00
parent 8a8377733b bcee37d2a9
commit 88cdfe304d
2 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
-11
View File
@@ -1205,17 +1205,6 @@ class commonModel extends model
/* Cycling to print every sub menu. */
foreach($menu as $menuItem)
{
/* Fix work and contribute navigation permission check issues. */
if(isset($menuItem->link) and isset($menuItem->link['module']) and isset($menuItem->link['method']))
{
if($menuItem->link['module'] == 'my' and ($menuItem->link['method'] == 'work' or $menuItem->link['method'] == 'contribute'))
{
$mode = explode('&', $menuItem->link['vars']);
$mode = substr($mode[0], 5);
$menuItem->hidden = !common::hasPriv('my', $mode);
}
}
if(isset($menuItem->hidden) && $menuItem->hidden) continue;
if($isMobile and empty($menuItem->link)) continue;
if($menuItem->divider) echo "<li class='divider'></li>";
module/group/lang/resource.php
+18 -30
View File
@@ -94,39 +94,27 @@ $lang->resource->my->manageContacts = 'manageContacts';
$lang->resource->my->deleteContacts = 'deleteContacts';
$lang->resource->my->score = 'score';
$lang->resource->my->team = 'team';
$lang->resource->my->requirement = 'requirement';
$lang->resource->my->story = 'story';
$lang->resource->my->task = 'task';
$lang->resource->my->bug = 'bug';
$lang->resource->my->doc = 'doc';
$lang->resource->my->testtask = 'testtask';
$lang->resource->my->testcase = 'testcase';
$lang->resource->my->execution = 'execution';
$lang->my->methodOrder[1] = 'index';
$lang->my->methodOrder[5] = 'todo';
$lang->my->methodOrder[10] = 'work';
$lang->my->methodOrder[15] = 'contribute';
$lang->my->methodOrder[20] = 'project';
$lang->my->methodOrder[25] = 'profile';
$lang->my->methodOrder[30] = 'uploadAvatar';
$lang->my->methodOrder[35] = 'preference';
$lang->my->methodOrder[40] = 'dynamic';
$lang->my->methodOrder[45] = 'editProfile';
$lang->my->methodOrder[50] = 'changePassword';
$lang->my->methodOrder[55] = 'manageContacts';
$lang->my->methodOrder[60] = 'deleteContacts';
$lang->my->methodOrder[65] = 'score';
$lang->my->methodOrder[70] = 'unbind';
$lang->my->methodOrder[75] = 'team';
$lang->my->methodOrder[80] = 'requirement';
$lang->my->methodOrder[85] = 'story';
$lang->my->methodOrder[90] = 'task';
$lang->my->methodOrder[95] = 'bug';
$lang->my->methodOrder[100] = 'testtask';
$lang->my->methodOrder[105] = 'testcase';
$lang->my->methodOrder[110] = 'execution';
$lang->my->methodOrder[115] = 'doc';
$lang->my->methodOrder[1] = 'index';
$lang->my->methodOrder[5] = 'todo';
$lang->my->methodOrder[10] = 'work';
$lang->my->methodOrder[15] = 'contribute';
$lang->my->methodOrder[20] = 'project';
$lang->my->methodOrder[25] = 'profile';
$lang->my->methodOrder[30] = 'uploadAvatar';
$lang->my->methodOrder[35] = 'preference';
$lang->my->methodOrder[40] = 'dynamic';
$lang->my->methodOrder[45] = 'editProfile';
$lang->my->methodOrder[50] = 'changePassword';
$lang->my->methodOrder[55] = 'manageContacts';
$lang->my->methodOrder[60] = 'deleteContacts';
$lang->my->methodOrder[65] = 'score';
$lang->my->methodOrder[70] = 'unbind';
$lang->my->methodOrder[75] = 'team';
$lang->my->methodOrder[80] = 'execution';
$lang->my->methodOrder[85] = 'doc';
/* Todo. */
$lang->resource->todo = new stdclass();