diff --git a/module/action/config.php b/module/action/config.php index 6b43594490..7b0ca2de37 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -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,'; diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index 772c24ff55..a57f5be81f 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -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 = ''; diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 7bf61d8e48..ebccd6dbea 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -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;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 731e157df3..5c0d81678d 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -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); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index dbce2ebdaf..2738d33afb 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -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'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 544eddb819..e8e0b655e3 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -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 = '在右侧添加看板列'; diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 4788497e84..ff5f89d609 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -11,7 +11,7 @@ */ ?>