* fix bug #18522.
This commit is contained in:
@@ -2,11 +2,13 @@
|
||||
public function setMenu($executionID, $buildID = 0, $extra = '')
|
||||
{
|
||||
common::setMenuVars('execution', $executionID);
|
||||
|
||||
$execution = $this->getById($executionID);
|
||||
if(isset($this->lang->execution->menu->kanban))
|
||||
{
|
||||
$this->loadModel('project')->setMenu($execution->project);
|
||||
$this->lang->kanban->menu->execution['subMenu'] = $this->lang->execution->menu;
|
||||
if($this->app->rawModule == 'tree') unset($this->lang->kanban->menu->execution['subMenu']);
|
||||
}
|
||||
|
||||
$kanbanList = $this->getList($execution->project, 'kanban', 'all');
|
||||
|
||||
@@ -3,7 +3,6 @@ class product extends control
|
||||
{
|
||||
public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
|
||||
{
|
||||
|
||||
/* Load datatable and execution. */
|
||||
$this->loadModel('datatable');
|
||||
$this->loadModel('execution');
|
||||
@@ -165,7 +164,7 @@ class product extends control
|
||||
$this->view->browseType = $browseType;
|
||||
$this->view->modules = $this->tree->getOptionMenu($productID, 'story', 0, $branchID);
|
||||
$this->view->moduleID = $moduleID;
|
||||
$this->view->moduleName = ($moduleID and $moduleID !== 'all') ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
|
||||
$this->view->moduleName = ($moduleID and $moduleID !== 'all') ? $this->tree->getById($moduleID)->name : $this->lang->tree->allMenu;
|
||||
$this->view->branch = $branch;
|
||||
$this->view->branchID = $branchID;
|
||||
$this->view->branchOption = $branchOption;
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
<?php
|
||||
$lang->product->noModule = '您现在还没有目录信息';
|
||||
$lang->product->storySummary = "本页共 <strong>%s</strong> 个%s,预计 <strong>%s</strong> 个{$lang->hourCommon}。";
|
||||
@@ -205,7 +205,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
|
||||
<?php endif;?>
|
||||
<?php echo $moduleTree;?>
|
||||
<div class="text-center">
|
||||
<?php if($productID) common::printLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branchID", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
|
||||
<?php if($productID) common::printLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branchID", $lang->tree->manageMenu, '', "class='btn btn-info btn-wide'");?>
|
||||
<hr class="space-sm" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
helper::importControl('tree');
|
||||
class myTree extends tree
|
||||
{
|
||||
public function browseTask($rootID, $productID = 0, $currentModuleID = 0)
|
||||
{
|
||||
$this->lang->kanban->menu->execution['subModule'] = 'tree';
|
||||
$this->lang->kanban->menu->story['subModule'] = '';
|
||||
return parent::browseTask($rootID, $productID, $currentModuleID);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
$lang->tree->allMenu = '所有目录';
|
||||
$lang->tree->manageMenu = '维护目录';
|
||||
|
||||
global $app;
|
||||
if($app->rawModule == 'tree' and $app->rawMethod == 'browse')
|
||||
{
|
||||
$lang->tree->edit = '编辑目录';
|
||||
$lang->tree->delete = '删除目录';
|
||||
$lang->tree->child = '子目录';
|
||||
$lang->tree->manageStoryChild = '维护子目录';
|
||||
$lang->tree->name = '目录名称';
|
||||
$lang->tree->syncFromProduct = '复制目录';
|
||||
}
|
||||
Reference in New Issue
Block a user