From 521a8e871d29cad0ab5e26299daad2c55058c003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 9 Nov 2021 14:39:07 +0800 Subject: [PATCH 1/2] * Finish task #44139. --- module/execution/js/kanban.js | 1 - module/story/control.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index c55ff68665..87fbade59d 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -38,7 +38,6 @@ function renderUserAvatar(user, objectType, objectID) if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar; if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; - return $('').avatar({user: user}); } diff --git a/module/story/control.php b/module/story/control.php index d9cf6ad772..13545833b1 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1793,6 +1793,7 @@ class story extends control } $stories = $this->story->getProductStoryPairs($productID, $branch ? "0,$branch" : $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); + if(empty($stories)) $stories = $this->story->getProductStoryPairs($productID, $branch ? "0,$branch" : $branch, 0, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); $storyID = isset($stories[$storyID]) ? $storyID : 0; $select = html::select('story', empty($stories) ? array('' => '') : $stories, $storyID, "class='form-control'"); From dc2e2cba795787584e2eb690eb512e13bae55466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 9 Nov 2021 14:57:42 +0800 Subject: [PATCH 2/2] * Adjust doc css. --- module/doc/css/objectlibs.css | 8 ++++---- module/doc/model.php | 14 ++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 8656d576da..e5a12a8689 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -46,10 +46,10 @@ .tree li>.list-toggle {left: -4px; top: 0;} .tree-group {position: relative;} .tree-group > .module-name {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 100%; display: block;} -.tree-group .tree-actions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;} +.tree-group .treeActions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;} .tree-group:hover > .module-name {width: calc(100% - 84px);} -.tree-group:hover .tree-actions {display: block} -.tree-group .tree-actions > .dropdown {display: inline-block;} +.tree-group:hover .treeActions {display: block} +.tree-group .treeActions > .dropdown {display: inline-block;} .tree-group .dropdown-menu {position: absolute; right: 0; left: auto; margin-top: -2px;} .tree-group .dropdown-menu > li > a {max-width: 100%; color: #3c4353!important; font-weight: normal!important;} -.tree-group .dropdown-menu > li > a:hover {color: #fff;} +.tree-group .dropdown-menu > li > a:hover {color: #fff !important;} diff --git a/module/doc/model.php b/module/doc/model.php index 648ff9e34a..a03eccaf74 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2373,7 +2373,7 @@ EOT; if($currentMethod == 'objectlibs') { $treeMenu[$module->id] .= "
" . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "  " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'") . ''; - $treeMenu[$module->id] .= "
"; + $treeMenu[$module->id] .= "
"; $treeMenu[$module->id] .= html::a(helper::createLink('doc', 'edit', "docID=$docID&comment=false&objectType=$type&objectID=$objectID&libID=$libID"), "", '', "title={$this->lang->doc->edit}"); $treeMenu[$module->id] .= '
'; $treeMenu[$module->id] .= ""; @@ -2388,11 +2388,6 @@ EOT; if($typeKey == 'url') $treeMenu[$module->id] .= '
  • '; } - if(common::hasPriv('doc', 'createLib')) - { - $treeMenu[$module->id] .= '
  • '; - $treeMenu[$module->id] .= '
  • ' . html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), " " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '
    • '; - } $treeMenu[$module->id] .= ""; $treeMenu[$module->id] .= "
    "; $treeMenu[$module->id] .= "lang->tree->dragAndSort}>"; @@ -2421,7 +2416,7 @@ EOT; else { $li = "
    " . $module->name . ''; - $li .= "
    "; + $li .= "
    "; $li .= html::a(helper::createLink('tree', 'edit', "module=$module->id&type=doc"), "", '', "data-toggle='modal' title={$this->lang->doc->editType}"); $li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "", '', "class='iframe' title={$this->lang->doc->editType}"); $li .='
    '; @@ -2437,11 +2432,6 @@ EOT; if($typeKey == 'url') $li .= '
  • '; } - if(common::hasPriv('doc', 'createLib')) - { - $li .= '
  • '; - $li .= '
  • ' . html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), " " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '
    • '; - } $li .= ""; $li .= '
    '; $li .= "lang->tree->dragAndSort}>";