diff --git a/module/kanban/css/common.css b/module/kanban/css/common.css index 7088d7d0f5..3bb1c0d82c 100644 --- a/module/kanban/css/common.css +++ b/module/kanban/css/common.css @@ -2,3 +2,4 @@ .color-picker-item > .icon {color: #fff; display: none} .checked > .icon {display: inline-block;} +#teamBox .chosen-container .chosen-results {max-height: 180px;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index be6f0d4c6a..18c0c37889 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -194,16 +194,18 @@ function renderLaneName($lane, lane, $kanban, columns, kanban) */ function renderKanbanItem(item, $item) { - var $title = $item.children('.title'); + var $title = $item.children('.title'); + var privs = item.actions; + var printMoreBtn = (privs.includes('editCard') || privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor')); if(!$title.length) { - $title = $('') - .appendTo($item); + if(privs.includes('viewCard')) $title = $('').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true)); + if(!privs.includes('viewCard')) $title = $('

').appendTo($item); } - $title.text(item.name); - $title.attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true)); - if(item.actions.length) + $title.text(item.name).attr('title', item.name); + + if(printMoreBtn) { $( [ @@ -604,7 +606,7 @@ function createLaneMenu(options) if(!privs.length) return []; var items = []; - if(privs.includes('setLane')) items.push({label: kanbanLang.editLane, icon: 'edit', url: createLink('kanban', 'setLane', 'laneID=' + lane.id + '&executionID=0&from=kanban'), className: 'iframe', attrs: {'data-toggle': 'modal'}}); + if(privs.includes('setLane')) items.push({label: kanbanLang.editLane, icon: 'edit', url: createLink('kanban', 'setLane', 'laneID=' + lane.id + '&executionID=0&from=kanban'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '635px'}}); if(privs.includes('deleteLane')) items.push({label: kanbanLang.deleteLane, icon: 'trash', url: createLink('kanban', 'deleteLane', 'lane=' + lane.id), className: 'confirmer', attrs: {'data-confirmTitle': kanbanlaneLang.confirmDelete, 'data-confirmDetail': kanbanlaneLang.confirmDeleteDetail}}); var bounds = options.$trigger[0].getBoundingClientRect(); diff --git a/module/kanban/model.php b/module/kanban/model.php index 9f50b19531..6325bf7e4a 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -573,7 +573,7 @@ class kanbanModel extends model //->orderBy('`order` asc') ->fetchAll('id'); - $actions = array('editCard', 'archiveCard', 'copyCard', 'deleteCard', 'moveCard', 'setCardColor'); + $actions = array('editCard', 'archiveCard', 'copyCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard'); $cardGroup = array(); foreach($cards as $card) { diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 288699dde9..01d7e6cda2 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -33,7 +33,7 @@ kanban->team;?> - +
fetch('my', 'buildContactLists');?> diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 5de9641a5d..df92a585ac 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -29,7 +29,7 @@ kanbanspace->team;?> - +
fetch('my', 'buildContactLists');?> diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index d4168ad8a0..e8d7e583f1 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -33,7 +33,7 @@ kanban->team;?> - +
team, "class='form-control chosen' multiple");?> fetch('my', 'buildContactLists');?> diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index cf8989d464..f6d4b39c20 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -30,7 +30,7 @@ kanbanspace->team;?> - +
team, "class='form-control chosen' multiple");?> fetch('my', 'buildContactLists');?> diff --git a/module/kanban/view/viewcard.html.php b/module/kanban/view/viewcard.html.php index 605d7a5edb..727e31d74b 100644 --- a/module/kanban/view/viewcard.html.php +++ b/module/kanban/view/viewcard.html.php @@ -14,23 +14,21 @@