Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/183_tianshujie_bug' into 'master'

Browse Source 
Sprint/183 tianshujie bug

See merge request easycorp/zentaopms!1596
This commit is contained in:
孙广明
2022-01-25 05:38:26 +00:00
parent 5fec7d3964 363af0483b
commit cac8eaa104
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/view/export.html.php
+2 -2
View File
@@ -259,7 +259,7 @@ if($isCustomExport)
<table class="table table-form">
<tbody>
<tr>
<th class='w-120px'><?php echo $lang->file->fileName;?></th>
<th class='w-230px'><?php echo $lang->file->fileName;?></th>
<td class="w-300px"><?php echo html::input('fileName', isset($fileName) ? $fileName : '', "class='form-control' autofocus placeholder='{$lang->file->untitled}'");?></td>
<td></td>
</tr>
@@ -321,7 +321,7 @@ if($isCustomExport)
<?php endif?>
<tr>
<th></th>
<td>
<td class='text-center'>
<?php echo html::submitButton($lang->export, "onclick='setDownloading();'", 'btn btn-primary');?>
</td>
</tr>
module/kanban/css/view.css
+1 -1
View File
@@ -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}
module/kanban/js/view.js
+4 -4
View File
@@ -492,8 +492,8 @@ function renderReleaseItem(item, $item)
var $title = $item.children('.releaseTitle');
if(!$title.length)
{
if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle"><i class="icon icon-flag"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<a class="releaseTitle"><i class="icon icon-flag"></i>' + item.name + '</a>').appendTo($item);
if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').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 = $('<a class="title"><i class="icon icon-code"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-code"></i>' + item.name + '</a>').appendTo($item);
if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item);
}
$title.attr('title', item.name);
module/testcase/control.php
+1 -1
View File
@@ -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', ''));