diff --git a/module/project/control.php b/module/project/control.php index 55bed48a19..893eed749e 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2139,13 +2139,8 @@ class project extends control $data = fixer::input('post')->get(); if(common::hasPriv('project', 'kanbanHideCols')) { - $allCols = array(); - if(isset($this->config->project->kanbanSetting->allCols)) - { - $allCols = json_decode($this->config->project->kanbanSetting->allCols, true); - } - $allCols[$projectID] = $data->allCols; - $this->setting->setItem("system.project.kanbanSetting.allCols", json_encode($allCols)); + $allCols = $data->allCols; + $this->setting->setItem("system.project.kanbanSetting.allCols", $allCols); } $account = $this->app->user->account; diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css index 453f4a8cfb..945e7463ab 100644 --- a/module/project/css/kanban.css +++ b/module/project/css/kanban.css @@ -78,7 +78,7 @@ table th.col-closed {width:14%} .board-story.stage-tested {color:#827717; background-color: #F9FBE7} .board-story.stage-released {color:#9C27B0; background-color: #F3E5F5} -.board-story.inverse {background: #dd7503} +.board-story.inverse {background: #dd7503; color:#f1f1f1} .board-story.stage-projected.inverse {background-color:#777;} .board-story.stage-developing.inverse {background-color:#D2322D;} .board-story.stage-developed.inverse {background-color:#229F24;} diff --git a/module/project/model.php b/module/project/model.php index c4fdf44a39..47d83fc054 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2243,16 +2243,9 @@ class projectModel extends model { $allCols = '1'; $showOption = '0'; - if(isset($this->config->project->kanbanSetting->allCols)) - { - $allColPairs = json_decode($this->config->project->kanbanSetting->allCols, true); - if(isset($allColPairs[$projectID])) $allCols = $allColPairs[$projectID]; - } + if(isset($this->config->project->kanbanSetting->allCols)) $allCols = $this->config->project->kanbanSetting->allCols; - if(isset($this->config->project->kanbanSetting->showOption)) - { - $showOption = $this->config->project->kanbanSetting->showOption; - } + if(isset($this->config->project->kanbanSetting->showOption)) $showOption = $this->config->project->kanbanSetting->showOption; $colorList = $this->config->project->kanbanSetting->colorList; if(!is_array($colorList)) $colorList = json_decode($colorList, true); diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index b7a6ed1b25..d7dda4a670 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -54,18 +54,9 @@ $account = $this->app->user->account