Merge branch dev/bug-65047 of zentao/zentaopms (#11425)
This commit is contained in:
@@ -64,13 +64,13 @@ $config->productplan->actionList['linkStory']['icon'] = 'link';
|
||||
$config->productplan->actionList['linkStory']['hint'] = $lang->productplan->linkStory;
|
||||
$config->productplan->actionList['linkStory']['text'] = $lang->productplan->linkStory;
|
||||
$config->productplan->actionList['linkStory']['notLoadModel'] = true;
|
||||
if($app->rawModule) $config->productplan->actionList['linkStory']['url'] = array('module' => $app->rawModule, 'method' => 'view', 'params' => 'planID={id}&type=story&orderBy=id_desc&link=true');
|
||||
if($app->rawModule) $config->productplan->actionList['linkStory']['url'] = common::hasPriv('productplan', 'linkStory') ? array('module' => $app->rawModule, 'method' => 'view', 'params' => 'planID={id}&type=story&orderBy=id_desc&link=true') : null;
|
||||
|
||||
$config->productplan->actionList['linkBug']['icon'] = 'bug';
|
||||
$config->productplan->actionList['linkBug']['hint'] = $lang->productplan->linkBug;
|
||||
$config->productplan->actionList['linkBug']['text'] = $lang->productplan->linkBug;
|
||||
$config->productplan->actionList['linkBug']['notLoadModel'] = true;
|
||||
if($app->rawModule) $config->productplan->actionList['linkBug']['url'] = array('module' => $app->rawModule, 'method' => 'view', 'params' => 'planID={id}&type=bug&orderBy=id_desc&link=true');
|
||||
if($app->rawModule) $config->productplan->actionList['linkBug']['url'] = common::hasPriv('productplan', 'linkBug') ? array('module' => $app->rawModule, 'method' => 'view', 'params' => 'planID={id}&type=bug&orderBy=id_desc&link=true') : null;
|
||||
|
||||
$config->productplan->actionList['edit']['icon'] = 'edit';
|
||||
$config->productplan->actionList['edit']['hint'] = $lang->productplan->edit;
|
||||
|
||||
@@ -14,7 +14,7 @@ $config->release->editor->edit = array('id' => 'desc', 'tools' => 'simpleTool
|
||||
global $lang, $app;
|
||||
$config->release->actionList['linkStory']['icon'] = 'link';
|
||||
$config->release->actionList['linkStory']['hint'] = $lang->release->linkStory;
|
||||
$config->release->actionList['linkStory']['url'] = array('module' => 'release', 'method' => 'view', 'params' => 'releaseID={id}&type=story&link=true');
|
||||
$config->release->actionList['linkStory']['url'] = common::hasPriv('release', 'linkStory') ? array('module' => 'release', 'method' => 'view', 'params' => 'releaseID={id}&type=story&link=true') : null;
|
||||
|
||||
$config->release->actionList['unlinkStory']['icon'] = 'unlink';
|
||||
$config->release->actionList['unlinkStory']['hint'] = $lang->release->unlinkStory;
|
||||
@@ -22,7 +22,7 @@ $config->release->actionList['unlinkStory']['url'] = 'javascript: unlinkObject(
|
||||
|
||||
$config->release->actionList['linkBug']['icon'] = 'bug';
|
||||
$config->release->actionList['linkBug']['hint'] = $lang->release->linkBug;
|
||||
$config->release->actionList['linkBug']['url'] = array('module' => 'release', 'method' => 'view', 'params' => 'releaseID={id}&type=bug&link=true');
|
||||
$config->release->actionList['linkBug']['url'] = common::hasPriv('release', 'linkBug') ? array('module' => 'release', 'method' => 'view', 'params' => 'releaseID={id}&type=bug&link=true') : null;
|
||||
|
||||
$config->release->actionList['unlinkBug']['icon'] = 'unlink';
|
||||
$config->release->actionList['unlinkBug']['hint'] = $lang->release->unlinkBug;
|
||||
|
||||
Reference in New Issue
Block a user