diff --git a/module/kanban/control.php b/module/kanban/control.php index 11558c05ef..da0e220524 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -56,7 +56,7 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); } - $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted'); $this->display(); } @@ -84,7 +84,7 @@ class kanban extends control } $this->view->space = $this->kanban->getSpaceById($spaceID); - $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->display(); } @@ -108,7 +108,7 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); } - $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted'); $this->view->spaceID = $spaceID; $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); @@ -137,7 +137,7 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); } - $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); $this->view->kanban = $this->kanban->getByID($kanbanID); @@ -307,7 +307,7 @@ class kanban extends control $this->view->card = $this->kanban->getCardByID($cardID); $this->view->actions = $this->action->getList('kanbancard', $cardID); - $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->allUsers = $this->loadModel('user')->getPairs(); $this->display(); diff --git a/module/kanban/model.php b/module/kanban/model.php index 84463c7412..af40260457 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1643,15 +1643,23 @@ class kanbanModel extends model $actions = ''; $actions .= "
"; $actions .= " {$this->lang->kanban->fullScreen}"; - $actions .= "" . ' ' . $this->lang->kanban->setting . ''; - $actions .= "
"; diff --git a/module/kanban/view/createcard.html.php b/module/kanban/view/createcard.html.php index fbfad8b3ea..114420a693 100644 --- a/module/kanban/view/createcard.html.php +++ b/module/kanban/view/createcard.html.php @@ -38,9 +38,9 @@ kanbancard->beginAndEnd;?>
- kanbancard->begin}'");?> + kanbancard->begin}'");?> ~ - kanbancard->end}'");?> + kanbancard->end}'");?>
diff --git a/module/kanban/view/editcard.html.php b/module/kanban/view/editcard.html.php index 76c18aa063..71c5f419f7 100644 --- a/module/kanban/view/editcard.html.php +++ b/module/kanban/view/editcard.html.php @@ -52,11 +52,11 @@ kanbancard->begin;?> - begin) ? '' : $card->begin, "class='form-control form-datetime'");?> + begin) ? '' : $card->begin, "class='form-control form-date'");?> kanbancard->end;?> - end) ? '' : $card->end, "class='form-control form-datetime'");?> + end) ? '' : $card->end, "class='form-control form-date'");?> kanbancard->pri;?>