diff --git a/config/filter.php b/config/filter.php index 4f95b0fc7b..cbe67cdec0 100644 --- a/config/filter.php +++ b/config/filter.php @@ -407,4 +407,4 @@ $filter->ci->checkCompileStatus->get['gitlabOnly'] = 'string'; $filter->tree->browse->cookie['preProductID'] = 'int'; $filter->tree->browse->cookie['preBranch'] = 'reg::word'; -$filter->kanban->space->cookie['showClosed'] = 'code'; +$filter->kanban->space->cookie['showClosed'] = 'code'; diff --git a/module/kanban/js/create.js b/module/kanban/js/create.js index 59627e6b13..97ea9a50ec 100644 --- a/module/kanban/js/create.js +++ b/module/kanban/js/create.js @@ -1,11 +1,12 @@ /** - * Refresh page. + * When type change. * - * @param string $type + * @oaram int spaceID + * @param string type * @access public * @return void */ -function refreshPage(spaceID, type) +function changeType(spaceID, type) { location.href = createLink('kanban', 'create', 'spaceID=' + spaceID + '&type=' + type); } diff --git a/module/kanban/js/createspace.js b/module/kanban/js/createspace.js index aab8289c27..ee146e7ee2 100644 --- a/module/kanban/js/createspace.js +++ b/module/kanban/js/createspace.js @@ -1,11 +1,11 @@ /** - * Refresh page. + * When type change. * - * @param string $type + * @param string type * @access public * @return void */ -function refreshPage(type) +function changeType(type) { location.href = createLink('kanban', 'createSpace', 'type=' + type); } diff --git a/module/kanban/model.php b/module/kanban/model.php index d6c8322c98..c9f1d50b57 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1309,21 +1309,18 @@ class kanbanModel extends model * * @param string $browseType private|cooperation|public|involved * @param object $pager - * @param int $closed 0|1 * @access public * @return array */ - public function getSpaceList($browseType, $pager = null, $closed = 0) + public function getSpaceList($browseType, $pager = null) { $account = $this->app->user->account; $spaceIdList = $this->getCanViewObjects('kanbanspace'); $spaceList = $this->dao->select('*')->from(TABLE_KANBANSPACE) ->where('deleted')->eq(0) - ->beginIF($browseType == 'private')->andWhere('type')->eq('private')->fi() - ->beginIF($browseType == 'cooperation')->andWhere('type')->eq('cooperation')->fi() - ->beginIF($browseType == 'public')->andWhere('type')->eq('public')->fi() + ->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi() ->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi() - ->beginIF($closed == 0)->andWhere('status')->ne('closed')->fi() + ->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi() ->orderBy('id_desc') ->page($pager) @@ -1342,23 +1339,20 @@ class kanbanModel extends model /** * Get space pairs. * - * @param string $browseType private|cooperation|public|involved|closed|noclosed - * @param $closed 0|1 + * @param string $browseType private|cooperation|public|involved * @access public * @return array */ - public function getSpacePairs($browseType = 'private', $closed = 0) + public function getSpacePairs($browseType = 'private') { $account = $this->app->user->account; $spaceIdList = $this->getCanViewObjects('kanbanspace'); return $this->dao->select('id,name')->from(TABLE_KANBANSPACE) ->where('deleted')->eq(0) - ->beginIF($browseType == 'private')->andWhere('type')->eq('private')->fi() - ->beginIF($browseType == 'cooperation')->andWhere('type')->eq('cooperation')->fi() - ->beginIF($browseType == 'public')->andWhere('type')->eq('public')->fi() + ->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi() ->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi() - ->beginIF($closed == 0)->andWhere('status')->ne('closed')->fi() + ->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi() ->orderBy('id_desc') ->fetchPairs('id'); @@ -1413,7 +1407,7 @@ class kanbanModel extends model * @access public * @return int */ - public function createSpace($type) + public function createSpace() { $account = $this->app->user->account; $space = fixer::input('post') @@ -1421,7 +1415,6 @@ class kanbanModel extends model ->setDefault('createdDate', helper::now()) ->setdefault('team', '') ->setdefault('owner', $account) - ->setdefault('type', $type) ->setdefault('whitelist', '') ->join('whitelist', ',') ->join('team', ',') diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 588aa68943..ee0b35ad5f 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -20,7 +20,7 @@ - + diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 7b925a34e5..20ea198c50 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -20,7 +20,7 @@
kanbanspace->type;?>
- +
kanbanspace->type;?>