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

* Finish task #44987,44988,44989.

Browse Source
This commit is contained in:
mayue
2021-11-30 10:32:11 +08:00
parent 19d489a645
commit d89aa24c8c
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.fix.html.php
+1 -1
View File
@@ -104,7 +104,7 @@ $(function()
<td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>
</tr>
<?php endif;?>
<?php if(!isset($product) or !empty($product) and $product->type != 'normal'):?>
<?php if(!empty($product) and $product->type != 'normal'):?>
<tr>
<td><?php echo $lang->datatable->showBranch;?></td>
<td><?php echo html::radio('showBranch', $lang->datatable->showBranchList, isset($config->$currentModule->$currentMethod->showBranch) ? $config->$currentModule->$currentMethod->showBranch : 1);?></td>
module/execution/control.php
+9 -5
View File
@@ -217,8 +217,12 @@ class execution extends control
$tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
}
$productModules = $this->tree->getById($moduleID);
$product = $this->product->getById(!empty($productID) ? $productID : (!empty($productModules) ? $productModules->root : 0));
$product = $this->product->getById($productID);
if(empty($productID))
{
$productModule = $this->tree->getById($moduleID);
$product = $this->product->getById((!empty($productModule) ? $productModule->root : 0));
}
if(!empty($product) and $product->type != 'normal')
{
$this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
@@ -790,10 +794,10 @@ class execution extends control
if($this->cookie->storyModuleParam)
{
$modules = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
$this->view->module = $modules;
$module = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
$this->view->module = $module;
$product = $this->product->getById($modules->root);
$product = $this->product->getById($module->root);
$this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
}
module/execution/view/task.html.php
-1
View File
@@ -37,7 +37,6 @@ body {margin-bottom: 25px;}
<?php
if(!empty($productID))
{
$product = $this->product->getById($productID);
$removeLink = $browseType == 'byproduct' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
$moduleName = $product->name;
$html = $moduleName . html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");