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

Merge branch 'sprint/168_sgm_testcase' into 'sprint/168'

Browse Source 
Sprint/168 sgm testcase

See merge request easycorp/zentaopms!365
This commit is contained in:
李玉春
2021-11-09 07:08:19 +00:00
parent 60766cee16 dc2e2cba79
commit 496ecd3c7a
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/objectlibs.css
+4 -4
View File
@@ -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;}
module/doc/model.php
+2 -12
View File
@@ -2373,7 +2373,7 @@ EOT;
if($currentMethod == 'objectlibs')
{
$treeMenu[$module->id] .= "<div class='tree-group'><span class='module-name'>" . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'") . '</span>';
$treeMenu[$module->id] .= "<div class='tree-actions'>";
$treeMenu[$module->id] .= "<div class='treeActions'>";
$treeMenu[$module->id] .= html::a(helper::createLink('doc', 'edit', "docID=$docID&comment=false&objectType=$type&objectID=$objectID&libID=$libID"), "<i class='icon icon-edit'></i>", '', "title={$this->lang->doc->edit}");
$treeMenu[$module->id] .= '<div class="dropdown dropdown-hover">';
$treeMenu[$module->id] .= "<a class='tree-action' href='javascript:;' data-toggle='dropdown'><i class='icon icon-plus'></i></a>";
@@ -2388,11 +2388,6 @@ EOT;
if($typeKey == 'url') $treeMenu[$module->id] .= '<li class="divider"></li>';
}
if(common::hasPriv('doc', 'createLib'))
{
$treeMenu[$module->id] .= '<li class="divider"></li>';
$treeMenu[$module->id] .= '<li>' . html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), "<i class='icon-doc-lib icon'></i> " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '</li>';
}
$treeMenu[$module->id] .= "</ul>";
$treeMenu[$module->id] .= "</div>";
$treeMenu[$module->id] .= "<a class='sort-handler tree-action' href='javascript:;' data-type='sort' title={$this->lang->tree->dragAndSort}><i class='icon icon-move'></i></a>";
@@ -2421,7 +2416,7 @@ EOT;
else
{
$li = "<div class='tree-group'><span class='module-name'><a title='{$module->name}'>" . $module->name . '</a></span>';
$li .= "<div class='tree-actions'>";
$li .= "<div class='treeActions'>";
$li .= html::a(helper::createLink('tree', 'edit', "module=$module->id&type=doc"), "<i class='icon icon-edit'></i>", '', "data-toggle='modal' title={$this->lang->doc->editType}");
$li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "<i class='icon icon-split'></i>", '', "class='iframe' title={$this->lang->doc->editType}");
$li .='<div class="dropdown dropdown-hover">';
@@ -2437,11 +2432,6 @@ EOT;
if($typeKey == 'url') $li .= '<li class="divider"></li>';
}
if(common::hasPriv('doc', 'createLib'))
{
$li .= '<li class="divider"></li>';
$li .= '<li>' . html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), "<i class='icon-doc-lib icon'></i> " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '</li>';
}
$li .= "</ul>";
$li .= '</div>';
$li .= "<a class='sort-handler tree-action' href='javascript:;' data-type='sort' title={$this->lang->tree->dragAndSort}><i class='icon icon-move'></i></a>";
module/execution/js/kanban.js
-1
View File
@@ -38,7 +38,6 @@ function renderUserAvatar(user, objectType, objectID)
if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar;
if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar;
return $('<a class="avatar has-text avatar-sm avatar-circle iframe" href="' + link + '"/>').avatar({user: user});
}
module/story/control.php
+1
View File
@@ -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'");