diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 2e7a4a429c..db6fd17222 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -259,7 +259,7 @@ if($isCustomExport) - + @@ -321,7 +321,7 @@ if($isCustomExport) - diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 202bac4137..91acc53cef 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -12,7 +12,7 @@ #kanbanContainer {padding-bottom: 0; margin-bottom: 0;} #kanbanContainer.fullscreen {overflow: auto;} -.region {border: 1px solid #dcdcdc; background-color: #fff; overflow: scroll;} +.region {border: 1px solid #dcdcdc; background-color: #fff;} .region + .region {margin-top: 20px;} .region .region-header {padding: 10px;} .region .region-header span {font-size: 14px; color: #999EAB} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 189e29aa3e..9013659986 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -492,8 +492,8 @@ function renderReleaseItem(item, $item) var $title = $item.children('.releaseTitle'); if(!$title.length) { - if(privs.includes('viewRelease') && item.deleted == '0') $title = $('' + item.name + '').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID)); - if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('' + item.name + '').appendTo($item); + if(privs.includes('viewRelease') && item.deleted == '0') $title = $('' + item.name + '').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID)); + if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('' + item.name + '').appendTo($item); } $title.attr('title', item.name); @@ -617,8 +617,8 @@ function renderBuildItem(item, $item) var $title = $item.children('.title'); if(!$title.length) { - if(privs.includes('viewBuild') && item.deleted == '0') $title = $('' + item.name + '').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID)); - if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('' + item.name + '').appendTo($item); + if(privs.includes('viewBuild') && item.deleted == '0') $title = $('' + item.name + '').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID)); + if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('' + item.name + '').appendTo($item); } $title.attr('title', item.name); diff --git a/module/testcase/control.php b/module/testcase/control.php index d92d09151c..a8607dfbc3 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -520,7 +520,7 @@ class testcase extends control if(dao::isError()) return print(js::error(dao::getError())); if(isonlybody()) { - $execution = $this->execution->getByID($this->session->execution); + $execution = $this->loadModel('execution')->getByID($this->session->execution); if($this->app->tab == 'execution' and $execution->type == 'kanban') { return print(js::closeModal('parent.parent', ''));
file->fileName;?>file->fileName;?> file->untitled}'");?>
+ export, "onclick='setDownloading();'", 'btn btn-primary');?>