diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index e8b43262f4..b58c26b636 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -172,9 +172,10 @@ function createColumnMenu(options) */ function createColumnCreateMenu(options) { - var $col = options.$trigger.closest('.kanban-col'); - var col = $col.data('col'); - var items = []; + var $col = options.$trigger.closest('.kanban-col'); + var col = $col.data('col'); + var items = []; + var laneID = col.$kanbanData.lanes[0].id ? col.$kanbanData.lanes[0].id : 0; if(col.type == 'backlog') { @@ -190,7 +191,7 @@ function createColumnCreateMenu(options) } else if(col.type == 'wait') { - if(priv.canCreateTask) items.push({label: taskLang.create, url: $.createLink('task', 'create', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); + if(priv.canCreateTask) items.push({label: taskLang.create, url: $.createLink('task', 'create', 'executionID=' + executionID + "&storyID=0&moduleID=0&taskID=0&todoID=0&extra=laneID=" + laneID + ",columnID=" + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canBatchCreateTask) items.push({label: taskLang.batchCreate, url: $.createLink('task', 'batchcreate', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); } return items; diff --git a/module/kanban/model.php b/module/kanban/model.php index a030284f05..d258680dfd 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1526,7 +1526,7 @@ class kanbanModel extends model ->add('region', $regionID) ->add('order', $maxOrder ? $maxOrder + 1 : 1) ->add('lastEditedTime', helper::now()) - ->setIF(isset($this->post->laneType), 'execution', $kanbanID) + ->setIF(isset($_POST['laneType']), 'execution', $kanbanID) ->trim('name') ->setDefault('color', '#7ec5ff') ->remove('laneType') diff --git a/module/program/css/project.css b/module/program/css/project.css index 9368f76487..499e53ecc1 100644 --- a/module/program/css/project.css +++ b/module/program/css/project.css @@ -1,3 +1,3 @@ .project-type-label.label-outline {width: 50px; min-width: 50px;} .project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;} -[lang^='en'] #projectTableList .project-name > .label-warning {width: 55px;} +[lang^='en'] .project-name > .label-warning {width: 55px !important;} diff --git a/module/project/css/browse.css b/module/project/css/browse.css index a61a305bae..5e32206b22 100644 --- a/module/project/css/browse.css +++ b/module/project/css/browse.css @@ -17,4 +17,4 @@ th.c-name {width: 360px !important;} { th.c-name {width: auto;} } -[lang^='en'] #projectTableList .project-name > .label-warning {width: 55px;} +[lang^='en'] .project-name > .label-warning {width: 55px !important;} diff --git a/module/task/control.php b/module/task/control.php index 69400b914e..956dd1a83b 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -106,6 +106,8 @@ class task extends control return $this->send($response); } + if(isset($output['laneID']) and isset($output['columnID'])) $this->loadModel('kanban')->addKanbanCell($executionID, $output['laneID'], $output['columnID'], 'task', $taskID); + /* if the count of tasksID is 1 then check exists. */ if(count($tasksID) == 1) {