diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css index 9312d4b9a4..f941cab7f2 100644 --- a/module/execution/css/executionkanban.css +++ b/module/execution/css/executionkanban.css @@ -1,4 +1,4 @@ -.main-table .table {cursor: default;} +.main-table .table {cursor: default; border-collapse: unset;} .boards {display: table; table-layout: fixed; width: 100%; min-width: 140px;} .board {display: table-cell; width: 25%; padding: 10px;} @@ -12,7 +12,7 @@ #kanban thead > tr > th:not(:last-child) {border-right: 2px solid #efefef;} #kanban tbody > tr > td {line-height: 24px;} #kanban tbody > tr > td {background-color: #F5F5F5;} -#kanban tbody > tr:not(:last-child) {border-bottom: 5px solid #fff !important;} +#kanban tbody > tr:not(:last-child) > td {border-bottom: 5px solid #fff !important;} .s-doing .table-row .table-col:last-child, .c-progress {width: 30px; padding-left: 3px; padding-top: 1px;} .table-row .table-col:first-child, .board-project {overflow: hidden; white-space: nowrap;} diff --git a/module/execution/js/task.js b/module/execution/js/task.js index 032f77cbbe..013627478d 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -9,7 +9,7 @@ $(function() $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60); }); - toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project'); + toggleFold('#executionTaskForm', unfoldTasks, executionID, 'project'); adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 1943eb0ef9..07ebd9f40d 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -48,7 +48,7 @@ isAdminToken) ? '' : 'disabled'; common::printLink('gitlab', 'edit', "gitlabID=$id", " ", '',"title={$lang->gitlab->edit} class='btn btn-primary'"); - common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn btn-primary {$disabled}' ,'disabled'"); + common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn {$disabled}' ,'disabled'"); if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'"); ?> diff --git a/module/product/model.php b/module/product/model.php index ed1443a4ae..9f78b9598a 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1984,7 +1984,7 @@ class productModel extends model */ public function setMenu($productID, $branch = 0, $module = 0, $moduleType = '', $extra = '') { - if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0) die(js::error($this->lang->product->accessDenied) . js::locate('back')); + if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) die(js::error($this->lang->product->accessDenied) . js::locate('back')); $product = $this->getByID($productID); $params = array('branch' => $branch); diff --git a/module/qa/model.php b/module/qa/model.php index 4d917fbf75..195735848a 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -23,7 +23,7 @@ class qaModel extends model */ public function setMenu($products, $productID, $branch = 0, $extra = '') { - if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0) + if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) { $this->app->loadLang('product'); die(js::error($this->lang->product->accessDenied) . js::locate('back')); diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 908f244282..aba275f885 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -54,28 +54,28 @@ $lang->tutorial->tasks['createStory']['desc'] = "

Create a story: