diff --git a/module/execution/control.php b/module/execution/control.php index dda8fd7148..f54cc6c875 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -515,6 +515,13 @@ class execution extends control $mails = $this->execution->importBug($executionID); if(dao::isError()) return print(js::error(dao::getError())); + /* If link from no head then reload. */ + if(isonlybody()) + { + $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all'); + return print(js::reload('parent')); + } + return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent')); } diff --git a/module/execution/js/importbug.js b/module/execution/js/importbug.js index cdaccc8e08..3eb40fb373 100644 --- a/module/execution/js/importbug.js +++ b/module/execution/js/importbug.js @@ -1,4 +1,18 @@ $(function() { + $(".preview").modalTrigger({width:1000, type:'iframe'}); $('#' + browseType + 'Tab').addClass('active'); + + if(isonlybody == true) parent.$('#triggerModal .modal-content .modal-header .close').hide(); }); + +/** + * Go back. + * + * @access public + * @return void + */ +function goback() +{ + parent.location.reload(); +} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 25ec3382c3..64a60d76b1 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -1049,7 +1049,7 @@ function createStoryMenu(options) var items = []; var showAction = story.$col.type == 'backlog' || story.$col.type == 'ready' || story.$col.type == 'developing' || story.$col.type == 'developed' || story.$col.type == 'testing' || story.$col.type == 'tested' || story.$col.type == 'verified' || story.$col.type == 'released'; - + if(priv.canEditStory) items.push({label: storyLang.edit, icon: 'edit', url: createLink('story', 'edit', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canChangeStory && showAction) items.push({label: storyLang.change, icon: 'change', url: createLink('story', 'change', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canCreateTask && showAction) items.push({label: executionLang.wbs, icon: 'plus', url: createLink('task', 'create', 'executionID=' + execution.id + '&storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php index 18e8a86bb7..0a1a030c45 100755 --- a/module/execution/view/importbug.html.php +++ b/module/execution/view/importbug.html.php @@ -13,10 +13,8 @@ - + +