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

Merge branch '18.x' into ipd1.1

Browse Source
This commit is contained in:
tanghucheng
2023-09-19 02:22:20 -04:00
parent 89752e9e6c 04399f47ec
commit dafa4a41dd
33 changed files with 127 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/task.css
+2
View File
@@ -25,3 +25,5 @@ body {margin-bottom: 10px;}
.dtable-row.is-normal .dtable-cell[data-col="name"] {padding-left: 20px;}
.dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
span.delayed {display: inline-block; height: 20px; line-height: 18px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px; padding: 2px 8px; margin-left: -8px;}
module/execution/view/task.html.php
+1 -1
View File
@@ -15,7 +15,7 @@ include '../../common/view/header.html.php';
include '../../common/view/datatable.fix.html.php';
include '../../common/view/zui3dtable.html.php';
$cols = $this->task->generateCol($orderBy);
$tasks = $this->task->generateRow($tasks, $users, $productID);
$tasks = $this->task->generateRow($tasks, $users, $executionID, $showBranch, $branchGroups, $modulePairs);
$sortLink = helper::createLink('execution', 'task', "executionID={$execution->id}&status={$status}&param={$param}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}");
js::set('moduleID', $moduleID);
js::set('productID', $productID);