diff --git a/module/execution/control.php b/module/execution/control.php index d6c827e1a6..2899d4199e 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1747,7 +1747,7 @@ class execution extends control $this->view->teamMembers = $this->execution->getTeamMembers($executionID); if($this->config->systemMode == 'new') $this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', $project->id); - $this->view->laneCount = $this->kanban->getLaneCount($executionID, $execution->model); + $this->view->laneCount = $this->kanban->getLaneCount($executionID, $execution->type); $this->view->heightType = $execution->displayCards > 2 ? 'custom' : 'auto'; $this->view->displayCards = $execution->displayCards ? $execution->displayCards : ''; diff --git a/module/execution/model.php b/module/execution/model.php index 7d0456d6ec..e067a6201c 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -333,7 +333,6 @@ class executionModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) ->setDefault('team', substr($this->post->name, 0, 30)) - ->setDefault('displayCards', 0) ->setIF($this->post->heightType == 'auto', 'displayCards', 0) ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->setIF($this->config->systemMode == 'new', 'parent', $this->post->project) @@ -487,7 +486,6 @@ class executionModel extends model ->add('id', $executionID) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) - ->setDefault('displayCards', 0) ->setIF($this->post->heightType == 'auto', 'displayCards', 0) ->setIF(helper::isZeroDate($this->post->begin), 'begin', '') ->setIF(helper::isZeroDate($this->post->end), 'end', '') diff --git a/module/kanban/control.php b/module/kanban/control.php index b157a89e31..3425d473e2 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -274,7 +274,6 @@ class kanban extends control $this->view->displayCards = $kanban->displayCards ? $kanban->displayCards : ''; $this->view->enableImport = empty($kanban->object) ? 'off' : 'on'; $this->view->importObjects = empty($kanban->object) ? array() : explode(',', $kanban->object); - a($this->view->laneCount); $this->display(); } diff --git a/module/kanban/css/create.css b/module/kanban/css/create.css index 57fb15f270..226da7d7f2 100644 --- a/module/kanban/css/create.css +++ b/module/kanban/css/create.css @@ -7,3 +7,5 @@ #mainContent .objectBox .checkbox-primary>label:not(:first-child) {padding-left: 20px;} #mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;} #mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;} +[lang^='en'] .columnWidth {width: 120px;} +[lang^='zh-cn'] .columnWidth {width: 80px;} diff --git a/module/kanban/css/edit.css b/module/kanban/css/edit.css index 4c852c6e5a..f2f7417d0f 100644 --- a/module/kanban/css/edit.css +++ b/module/kanban/css/edit.css @@ -8,3 +8,5 @@ #mainContent .laneHeightBox .tip {color: #999;} #mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;} #mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;} +[lang^='en'] .columnWidth {width: 120px;} +[lang^='zh-cn'] .columnWidth {width: 80px;} diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index e30c4b786b..56204f9794 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -15,7 +15,6 @@ config->vision);?> -app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>