From 6b671ddd1ee8cdedc2243bda1d05a33f616aa6bb Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 26 Aug 2022 09:23:05 +0800 Subject: [PATCH 1/4] * Fix bug #26852. --- module/product/view/browse.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 43f642332b..f234bbdbfd 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -290,14 +290,14 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $canBatchClose = (common::hasPriv($storyType, 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory'); $canBatchReview = ($canBeChanged and common::hasPriv($storyType, 'batchReview')); $canBatchChangeStage = ($canBeChanged and common::hasPriv('story', 'batchChangeStage') and $storyType == 'story'); - $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch')); + $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch') and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID); $canBatchChangeModule = ($canBeChanged and common::hasPriv($storyType, 'batchChangeModule')); $canBatchChangePlan = ($canBeChanged and common::hasPriv('story', 'batchChangePlan') and $storyType == 'story'); $canBatchAssignTo = ($canBeChanged and common::hasPriv($storyType, 'batchAssignTo')); $canBatchUnlink = ($canBeChanged and $this->app->tab == 'project' and common::hasPriv('projectstory', 'batchUnlinkStory')); $canBatchImportToLib = ($canBeChanged and $this->app->tab == 'project' and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib')); - $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib); + $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib or $canBatchChangeBranch); ?> ';?> ' id='storyList' data-fixed-left-width='' data-fixed-right-width=''> @@ -442,7 +442,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; echo "
  • " . html::a('javascript:;', $lang->story->review, '', $class) . '
    • '; } - if($canBatchChangeBranch and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID) + if($canBatchChangeBranch) { $withSearch = count($branchTagOption) > 8; echo "
  • "; From 7aeaaeb5735b534ec27db6b90e87ea39213608e6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 26 Aug 2022 09:43:50 +0800 Subject: [PATCH 2/4] * Fix bug #26888. --- module/task/css/view.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/module/task/css/view.css b/module/task/css/view.css index 5bb814cad8..ff734be84e 100644 --- a/module/task/css/view.css +++ b/module/task/css/view.css @@ -1,8 +1,6 @@ .side-col .cell {padding: 0px;} .side-col #legendProjectAndTask .list-unstyled {padding: 10px; border: 1px solid #ddd; border-top: 0px; margin: 0px;} .tab-pane table {border: 1px solid #ddd; border-top: none;} -.page-title{max-width: 80%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} -.pull-left{max-width: 80%;} .MRThWidth {width: 90px !important;} .btn-edit-comment {z-index: 100;} From d4b043d72dd34722dfd7c12126e9bbc48ce83731 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 26 Aug 2022 09:56:57 +0800 Subject: [PATCH 3/4] * Fix bug #26902. --- lib/front/front.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 2d68563605..a2026338ac 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -57,6 +57,7 @@ class html extends baseHTML { $id = "id='$name'"; if(strpos($attrib, 'id=') !== false) $id = ''; + if(is_null($value)) $value = ''; $value = str_replace("'", ''', $value); $autocomplete = $autocomplete ? 'autocomplete="on"' : 'autocomplete="off"'; return "\n"; From 44e31923f730c6017568fee84fd01c8daac10d5a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 26 Aug 2022 10:12:12 +0800 Subject: [PATCH 4/4] * Fix bug #26918. --- module/task/config.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/module/task/config.php b/module/task/config.php index b14fdcb456..96ca1d4d79 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -71,9 +71,6 @@ $config->task->datatable->fieldList['mode']['control'] = 'hidden'; $config->task->datatable->fieldList['desc']['title'] = 'idAB'; $config->task->datatable->fieldList['desc']['control'] = 'textarea'; -$config->task->datatable->fieldList['deadline']['title'] = 'idAB'; -$config->task->datatable->fieldList['deadline']['control'] = 'date'; - $config->task->datatable->fieldList['pri']['title'] = 'priAB'; $config->task->datatable->fieldList['pri']['fixed'] = 'left'; $config->task->datatable->fieldList['pri']['width'] = '50'; @@ -95,6 +92,18 @@ $config->task->datatable->fieldList['status']['fixed'] = 'no'; $config->task->datatable->fieldList['status']['width'] = '60'; $config->task->datatable->fieldList['status']['required'] = 'no'; +$config->task->datatable->fieldList['assignedTo']['title'] = 'assignedTo'; +$config->task->datatable->fieldList['assignedTo']['fixed'] = 'no'; +$config->task->datatable->fieldList['assignedTo']['width'] = '100'; +$config->task->datatable->fieldList['assignedTo']['required'] = 'no'; +$config->task->datatable->fieldList['assignedTo']['control'] = 'select'; +$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution'); + +$config->task->datatable->fieldList['finishedBy']['title'] = 'finishedByAB'; +$config->task->datatable->fieldList['finishedBy']['fixed'] = 'no'; +$config->task->datatable->fieldList['finishedBy']['width'] = '80'; +$config->task->datatable->fieldList['finishedBy']['required'] = 'no'; + $config->task->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->task->datatable->fieldList['estimate']['fixed'] = 'no'; $config->task->datatable->fieldList['estimate']['width'] = '60'; @@ -121,6 +130,7 @@ $config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB'; $config->task->datatable->fieldList['deadline']['fixed'] = 'no'; $config->task->datatable->fieldList['deadline']['width'] = '70'; $config->task->datatable->fieldList['deadline']['required'] = 'no'; +$config->task->datatable->fieldList['deadline']['control'] = 'date'; $config->task->datatable->fieldList['openedBy']['title'] = 'openedByAB'; $config->task->datatable->fieldList['openedBy']['fixed'] = 'no'; @@ -143,23 +153,11 @@ $config->task->datatable->fieldList['realStarted']['fixed'] = 'no'; $config->task->datatable->fieldList['realStarted']['width'] = '95'; $config->task->datatable->fieldList['realStarted']['required'] = 'no'; -$config->task->datatable->fieldList['assignedTo']['title'] = 'assignedTo'; -$config->task->datatable->fieldList['assignedTo']['fixed'] = 'no'; -$config->task->datatable->fieldList['assignedTo']['width'] = '100'; -$config->task->datatable->fieldList['assignedTo']['required'] = 'no'; -$config->task->datatable->fieldList['assignedTo']['control'] = 'select'; -$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution'); - $config->task->datatable->fieldList['assignedDate']['title'] = 'assignedDate'; $config->task->datatable->fieldList['assignedDate']['fixed'] = 'no'; $config->task->datatable->fieldList['assignedDate']['width'] = '110'; $config->task->datatable->fieldList['assignedDate']['required'] = 'no'; -$config->task->datatable->fieldList['finishedBy']['title'] = 'finishedByAB'; -$config->task->datatable->fieldList['finishedBy']['fixed'] = 'no'; -$config->task->datatable->fieldList['finishedBy']['width'] = '80'; -$config->task->datatable->fieldList['finishedBy']['required'] = 'no'; - $config->task->datatable->fieldList['finishedDate']['title'] = 'finishedDateAB'; $config->task->datatable->fieldList['finishedDate']['fixed'] = 'no'; $config->task->datatable->fieldList['finishedDate']['width'] = '105';