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

Merge branch 'sprint/170_zhouxin_43877' into 'sprint/170'

Browse Source 
Sprint/170 zhouxin 43877

See merge request easycorp/zentaopms!308
This commit is contained in:
孙广明
2021-11-04 06:23:51 +00:00
parent 9d359fa387 8fe8ad90af
commit 6f5e1b75f7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+1 -1
View File
@@ -159,7 +159,7 @@ $lang->product->menu->plan = array('link' => "{$lang->productplan->shortComm
$lang->product->menu->release = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release');
$lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
if($config->systemMode == 'new') $lang->product->menu->project = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
if($config->systemMode == 'classic') $lang->product->menu->project = array('link' => "{$lang->execution->common}|product|project|status=all&productID=%s");
if($config->systemMode == 'classic') $lang->product->menu->project = array('link' => "{$lang->execution->common}|product|project|status=all&productID=%s");
$lang->product->menu->track = array('link' => "{$lang->track}|story|track|productID=%s");
$lang->product->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=product&objectID=%s", 'subModule' => 'doc');
$lang->product->menu->dynamic = array('link' => "{$lang->dynamic}|product|dynamic|productID=%s");
module/index/js/index.js
+2 -1
View File
@@ -152,7 +152,8 @@
if(viewType === 'doc' && (link.params.from === 'product' || link.params.$5 == 'product')) return 'product';
if(viewType === 'doc' && (link.params.from === 'project' || link.params.$5 == 'project')) return 'project';
if(viewType === 'doc') return 'doc';
if(viewType === 'doc') return 'doc';
if(viewType === 'story') return 'product';
}
else if(methodLowerCase === 'browsetask')
{
module/tree/view/edit.html.php
-1
View File
@@ -119,7 +119,6 @@ $(function()
{
$('#root').change(function()
{
if($(this).val() == currentRoot) return true;
var confirmRoot = <?php echo json_encode($type == 'doc' ? $lang->tree->confirmRoot4Doc : $lang->tree->confirmRoot);?>;
if(!confirm(confirmRoot))
{