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

Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170'

Browse Source 
Fix bug #16209.

See merge request easycorp/zentaopms!452
This commit is contained in:
李玉春
2021-11-15 05:23:45 +00:00
parent 1b2cf5ca09 ccb98adb41
commit ba6a2cd512
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+10 -2
View File
@@ -216,7 +216,7 @@ class product extends control
$this->app->loadLang('datatable');
$this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
}
/* Get stories. */
if($this->app->rawModule == 'projectstory')
{
@@ -992,16 +992,24 @@ class product extends control
}
$field = $fieldID ? "plans[$fieldID]" : 'plan';
$output = html::select($field, $plans, $planID, "class='form-control chosen'");
$output = "<div class='table-row'>";
$output .= "<div class='table-col'>";
$output .= html::select($field, $plans, $planID, "class='form-control chosen'");
$output .= "</div>";
if(count($plans) == 1 and $needCreate)
{
$output .= "<div class='table-col'>";
$output .= "<div class='input-group-btn'>";
$output .= html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch", '', true), "<i class='icon icon-plus'></i>", '', "class='btn btn-icon' data-toggle='modal' data-type='iframe' data-width='95%' title='{$this->lang->productplan->create}'");
$output .= '</div>';
$output .= '</div>';
$output .= "<div class='table-col'>";
$output .= "<div class='input-group-btn'>";
$output .= html::a("javascript:void(0)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$this->lang->refresh}' onclick='loadProductPlans($productID)'");
$output .= '</div>';
$output .= '</div>';
}
$output .= "</div>";
die($output);
}
module/story/css/batchedit.css
+3 -1
View File
@@ -2,9 +2,11 @@
.c-id {width: 40px;}
.c-estimate {width: 50px;}
.c-branch, .c-module {width: 120px;}
.c-plan, .c-title {width: 150px;}
.c-title {width: 150px;}
.c-plan {width: 170px;}
.c-category {width: 90px;}
.c-pri {width: 70px;}
.c-source {width: 130px;}
.c-note, .c-stage, .c-reason {width: 100px;}
.c-keywords {width: 80px;}
#batchEditForm > div > table > tbody > tr > td:nth-child(4) > div > div:nth-child(1) {width: 60%;}