Merge branch feature/workflowgroup of zentao/zentaopms (#10102)
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
<?php
|
||||
$config->admin->navsGroup['feature']['project'] .= 'story,';
|
||||
@@ -0,0 +1,16 @@
|
||||
<?php
|
||||
foreach($lang->admin->menuList->feature['tabMenu']['project'] as $key => $value)
|
||||
{
|
||||
if(!in_array($key, array('project', 'execution', 'story')))
|
||||
{
|
||||
unset($lang->admin->menuList->feature['tabMenu']['project'][$key]);
|
||||
}
|
||||
}
|
||||
|
||||
foreach($lang->admin->menuList->feature['tabMenu']['menuOrder']['project'] as $key => $value)
|
||||
{
|
||||
if(!in_array($key, array('project', 'execution', 'story')))
|
||||
{
|
||||
unset($lang->admin->menuList->feature['tabMenu']['menuOrder']['project'][$key]);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1240,7 +1240,7 @@ class bugZen extends bug
|
||||
if($bug->assignedTo && !isset($assignedToList[$bug->assignedTo]) && $bug->assignedTo != 'closed')
|
||||
{
|
||||
$assignedTo = $this->user->getById($bug->assignedTo);
|
||||
$assignedToList[$bug->assignedTo] = $assignedTo->realname;
|
||||
$assignedToList[$bug->assignedTo] = isset($assignedTo->realname) ? $assignedTo->realname : $bug->assignedTo;
|
||||
}
|
||||
if($bug->status == 'closed') $assignedToList['closed'] = 'Closed';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user