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

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

Browse Source 
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1121
This commit is contained in:
孙广明
2021-12-23 08:59:45 +00:00
parent b603c6186e 827b4ed3b5
commit 40d0b988d7
9 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/config.php
+1 -1
View File
@@ -55,4 +55,4 @@ $config->action->majorList['execution'] = array('opened', 'edited');
$config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,';
$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,';
$config->action->noLinkModules = ',doclib,module,webhook,gitlab,pipeline,jenkins,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,';
$config->action->noLinkModules = ',doclib,module,webhook,gitlab,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,';
module/action/view/trash.html.php
-4
View File
@@ -71,10 +71,6 @@
{
echo $action->objectName;
}
elseif($action->objectType == 'kanbancard')
{
echo html::a($this->createLink('kanban', 'viewCard', "id=$action->objectID", '', true), $action->objectName, '', "title={$action->objectName} class='iframe' data-width=80%");
}
else
{
$tab = '';
module/kanban/css/view.css
+2 -1
View File
@@ -31,11 +31,12 @@
.region .kanban-board.sort > .kanban-header {padding-left: 0;}
.region .kanban-header {border-bottom: none!important; min-width: max-content; min-width: -moz-max-content;}
.region .kanban-header-col > .title {max-width: 80% !important;}
.region .kanban-header-col > .title {margin: 0}
.region .kanban-header-col > .title > span {display: inline-block; overflow: hidden; padding-right:2px; position: initial;}
.region .kanban-header-col > .title > .text-grey {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .count {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .error {color: #333333; padding-left: 5px; font-size: 10px; padding-top: 1px;}
.region .kanban-header-col > .title > .error {color: #333333; padding-left: 5px; font-size: 10px; padding-top: 1px; padding-right: 5px;}
.kanban-affixed .kanban-header-col > .title > .text {color: #fff!important}
.region .kanban-header-col > .actions {position: relative; right: -30px;}
.region .kanban-header-parent-col > .actions {position: absolute; right: 0px;}
module/kanban/js/view.js
+1
View File
@@ -78,6 +78,7 @@ function exitFullScreen()
$('#kanbanContainer').removeClass('fullscreen')
.off('scroll', tryUpdateKanbanAffix);
$('.actions').show();
$('.action').show();
$('.kanban-group-header').show();
$(".title").attr("disabled", false).css("pointer-events", "auto");
$.cookie('isFullScreen', 0);
module/kanban/lang/en.php
-1
View File
@@ -73,7 +73,6 @@ $lang->kanban->closedBy = 'Closed By';
$lang->kanban->closedDate = 'Closed Date';
$lang->kanban->empty = 'No Kanban';
$lang->kanban->teamSumCount = '%s people in total';
$lang->kanban->deleted = 'Deleted';
$lang->kanban->createColumnOnLeft = 'Create Column On Left';
$lang->kanban->createColumnOnRight = 'Create Column On Right';
module/kanban/lang/zh-cn.php
-1
View File
@@ -73,7 +73,6 @@ $lang->kanban->closedBy = '由谁关闭';
$lang->kanban->closedDate = '关闭日期';
$lang->kanban->empty = '暂时没有看板';
$lang->kanban->teamSumCount = '共%s人';
$lang->kanban->deleted = '已删除';
$lang->kanban->createColumnOnLeft = '在左侧添加看板列';
$lang->kanban->createColumnOnRight = '在右侧添加看板列';
module/kanban/view/viewarchivedcard.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<style>
#archivedCards {top: 48px; right: -400px; width: 400px; position: fixed; z-index: 1050; background-color: rgb(255,255,255);}
#archivedCards {top: 50px; right: -400px; width: 400px; position: fixed; z-index: 1050; background-color: rgb(255,255,255);}
#archivedCards .panel .panel-body {overflow: auto; padding: 10px;}
#archivedCards .kanban-item {border: 1px solid #ddd; border-radius: 4px; padding: 5px;}
#archivedCards .kanban-item > .title {display: block; max-height: 38px; overflow: hidden; color: inherit; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;}
module/kanban/view/viewcard.html.php
-3
View File
@@ -17,9 +17,6 @@
<div class="page-title">
<span class="label label-id"><?php echo $card->id?></span>
<span class="text" title='<?php echo $card->name;?>'><?php echo $card->name;?></span>
<?php if($card->deleted):?>
<span class='label label-danger'><?php echo $lang->kanban->deleted;?></span>
<?php endif;?>
</div>
</div>
</div>
www/theme/default/style.css
+2 -1
View File
@@ -66,6 +66,7 @@ a.showMoreImage:hover {opacity: 1;}
.c-object {width: 250px;}
.c-case-step {width: 300px;}
#userNav>li.open>a:before, #userNav>li>a:hover:before {position: absolute; bottom: 0px; left: 22%; width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}
#userNav .dropdown-menu {z-index: 2000;}
#userNav .dropdown-menu:hover:before {position: absolute; top: -9px; right: 17%; width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}
#userNav .dropdown-menu .dropdown-menu:hover:before {content: none;}
#userNav .dropdown-menu, #userNav .create-list {margin-right: -15px !important; border-top: 0px;}
@@ -80,5 +81,5 @@ a.showMoreImage:hover {opacity: 1;}
#headerActions .btn-group > .btn.active, .btn:active, .open .dropdown-toggle.btn {background: rgba(0,0,0,0.15) !important;}
#headerActions #kanbanActionMenu {left: 55px}
#headerActions .setting {border-color: transparent;}
#headerActions .dropdown-menu {top: 35px;}
#headerActions .dropdown-menu {top: 35px; z-index: 2000;}
#headerActions .dropdown-menu:before, #headerActions .dropdown-menu:hover:before {position: absolute; top: -9px; right: 50%; width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}