From a9fc8620596ec206784131e8544ce3306fca7f4b Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 10 Dec 2021 10:25:44 +0800 Subject: [PATCH] * Finish task #45826. --- module/kanban/control.php | 5 ++--- module/kanban/js/setwip.js | 14 ++++++++++++++ module/kanban/view/setwip.html.php | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/module/kanban/control.php b/module/kanban/control.php index c7f01045b0..ff3000fb76 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -218,12 +218,11 @@ class kanban extends control $column = $this->kanban->getColumnById($columnID); if(!$column) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID"))); - $status = zget($this->config->kanban->{$column->laneType . 'ColumnStatusList'}, $column->type); $title = isset($column->parentName) ? $column->parentName . '/' . $column->name : $column->name; $this->view->title = $title . $this->lang->colon . $this->lang->kanban->setWIP . '(' . $this->lang->kanban->WIP . ')'; $this->view->column = $column; - $this->view->status = $status; + if($this->app->tab != 'kanban') $this->view->status = zget($this->config->kanban->{$column->laneType . 'ColumnStatusList'}, $column->type); $this->display(); } @@ -272,7 +271,7 @@ class kanban extends control { /* Check lane column name is unique. */ $exist = $this->kanban->getColumnByName($this->post->name, $column->lane); - if($exist and $exist->id != $columnID) + if($exist and $exist->id != $columnID and $this->app->tab != 'kanban') { return $this->sendError($this->lang->kanban->noColumnUniqueName); } diff --git a/module/kanban/js/setwip.js b/module/kanban/js/setwip.js index cf7b4a0563..e2bfdc833e 100644 --- a/module/kanban/js/setwip.js +++ b/module/kanban/js/setwip.js @@ -26,3 +26,17 @@ function setWIPLimit() $('#limit').val(count); } +/** + * When Wipcount value change. + * + * @param int $value + * @access public + * @return void + */ +function wipValueChange(value) +{ + if(value == '') + $('#submit').addClass('disabled'); + else + $('#submit').removeClass('disabled'); +} diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php index 512a50c232..9fdfdc4866 100644 --- a/module/kanban/view/setwip.html.php +++ b/module/kanban/view/setwip.html.php @@ -21,7 +21,7 @@
- parent != -1):?> + parent != -1 and $this->app->tab != 'kanban'):?>
kanban->WIPStatus;?> @@ -44,7 +44,7 @@
limit == -1 ? 'disabled' : '';?> - limit != -1 ? $column->limit : '', "class='form-control' $attr");?> + limit != -1 ? $column->limit : '', "class='form-control' $attr onchange='wipValueChange(this.value)'");?>
limit, "class='form-control'");?>