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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
Guanxiying
2021-04-15 09:57:13 +08:00
parent df90fbb77d c4454bb6d9
commit 78895ace0a
33 changed files with 70 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-cn.php
+1 -1
View File
@@ -453,7 +453,7 @@ $lang->action->label->testtask = '测试单|testtask|view|caseID=%s';
$lang->action->label->testsuite = '测试套件|testsuite|view|suiteID=%s';
$lang->action->label->caselib = '用例库|caselib|view|libID=%s';
$lang->action->label->todo = '待办|todo|view|todoID=%s';
$lang->action->label->doclib = '文档库|doc|doclibbrowse|libID=%s';
$lang->action->label->doclib = '文档库|doc|objectLibs|type=&objectID=&libID=%s';
$lang->action->label->doc = '文档|doc|view|docID=%s';
$lang->action->label->user = '用户|user|view|account=%s';
$lang->action->label->testreport = '报告|testreport|view|report=%s';
module/block/control.php
+1
View File
@@ -853,6 +853,7 @@ class block extends control
$this->loadModel('weekly');
$this->app->loadLang('task');
$this->app->loadLang('story');
$this->app->loadLang('bug');
/* Set project status and count. */
$status = isset($this->params->type) ? $this->params->type : 'all';
module/block/lang/de.php
-4
View File
@@ -18,12 +18,8 @@ $lang->block->grid = 'Gitter';
$lang->block->color = 'Farbe';
$lang->block->reset = 'Zurücksetzen';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Konto';
module/block/lang/en.php
-4
View File
@@ -18,12 +18,8 @@ $lang->block->grid = 'Position';
$lang->block->color = 'Color';
$lang->block->reset = 'Reset Layout';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Account';
module/block/lang/fr.php
-4
View File
@@ -18,12 +18,8 @@ $lang->block->grid = 'Position';
$lang->block->color = 'Couleur';
$lang->block->reset = 'Réinit';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Compte';
module/block/lang/vi.php
-4
View File
@@ -18,12 +18,8 @@ $lang->block->grid = 'Vị trí';
$lang->block->color = 'Màu';
$lang->block->reset = 'Thiết lập lại giao diện';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Tài khoản';
module/block/lang/zh-cn.php
-4
View File
@@ -18,12 +18,8 @@ $lang->block->grid = '位置';
$lang->block->color = '颜色';
$lang->block->reset = '恢复默认';
$lang->block->story = '需求';
$lang->block->bug = 'Bug';
$lang->block->investment = '投入';
$lang->block->left = '剩余';
$lang->block->estimate = '预计工时';
$lang->block->doneBugs = '已解决';
$lang->block->leftBugs = '未解决';
$lang->block->last = '近期';
$lang->block->account = '所属用户';
module/block/view/projectstatisticblock.html.php
+4 -4
View File
@@ -147,7 +147,7 @@ $(function()
<div class="col data"><?php echo $project->doneStories;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->left . "：";?></div>
<div class="col dataTitle"><?php echo $lang->project->surplus . "：";?></div>
<div class="col data"><?php echo $project->leftStories;?></div>
</div>
</div>
@@ -167,17 +167,17 @@ $(function()
</div>
</div>
<div class="col-4 text-center">
<div><h4><?php echo $lang->block->bug;?></h4></div>
<div><h4><?php echo $lang->bug->common;?></h4></div>
<div>
<div class="col dataTitle"><?php echo $lang->block->totalBug . "：";?></div>
<div class="col data"><?php echo $project->allBugs;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->doneBugs . "：";?></div>
<div class="col dataTitle"><?php echo $lang->bug->statusList['resolved'] . "：";?></div>
<div class="col data"><?php echo $project->doneBugs;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->leftBugs . "：";?></div>
<div class="col dataTitle"><?php echo $lang->bug->unResolved . "：";?></div>
<div class="col data"><?php echo $project->leftBugs;?></div>
</div>
</div>
module/common/lang/en.php
+1
View File
@@ -154,6 +154,7 @@ $lang->extension->common = 'Extension';
$lang->company->common = 'Company';
$lang->dept->common = 'Dept';
$lang->program->list = 'Program List';
$lang->execution->list = "{$lang->executionCommon} List";
$lang->personnel->common = 'Member';
$lang->personnel->invest = 'Investment';
module/common/lang/menu.php
+1 -1
View File
@@ -226,7 +226,7 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang->
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
$lang->execution->homeMenu->list = array('link' => "{$lang->executionCommon}列表|execution|all|", 'alias' => 'create,batchedit');
$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
$lang->execution->menu = new stdclass();
$lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
module/common/lang/zh-cn.php
+1
View File
@@ -154,6 +154,7 @@ $lang->extension->common = '插件';
$lang->company->common = '公司';
$lang->dept->common = '部门';
$lang->program->list = '项目集列表';
$lang->execution->list = "{$lang->executionCommon}列表";
$lang->personnel->common = '人员';
$lang->personnel->invest = '投入人员';
module/common/view/footer.lite.html.php
-2
View File
@@ -1,7 +1,5 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php if(empty($config->noHiddenwin)):?>
<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin hidden'></iframe>
<?php endif;?>
<?php if($this->loadModel('cron')->runable()) js::execute('startCron()');?>
<script>
<?php if(isset($pageJS)) echo $pageJS;?>
module/custom/view/timezone.html.php
-7
View File
@@ -32,11 +32,4 @@
<?php endif;?>
</div>
</div>
<script>
$(function()
{
$('#mainHeader #navbar li[data-id=model]').removeClass('active');
})
</script>
<?php include '../../common/view/footer.html.php';?>
module/doc/control.php
+7 -25
View File
@@ -780,31 +780,6 @@ class doc extends control
die(js::locate('back'));
}
/**
* Doc lib browse.
*
* @param int $libID
* @access public
* @return void
*/
public function doclibBrowse($libID = 0)
{
$doclib = $this->doc->getLibById($libID);
$objecitID = 0;
if($doclib->type == 'product')
{
$objectID = $doclib->product;
}
elseif($doclib->type == 'project' or $doclib->type == 'execution')
{
$doclib->type = 'project';
$objectID = $doclib->project;
}
die(js::locate($this->createLink('doc', 'objectLibs', "type={$doclib->type}&objectID=$objectID&libID=$libID")));
}
/**
* Show libs for product or project.
*
@@ -818,6 +793,13 @@ class doc extends control
*/
public function objectLibs($type, $objectID = 0, $libID = 0, $docID = 0, $version = 0)
{
if(empty($type))
{
$doclib = $this->doc->getLibById($libID);
$type = $doclib->type == 'execution' ? 'project' : $doclib->type;
$objectID = $type == 'custom' or $type == 'book' ? 0 : $doclib->$type;
}
$this->session->set('docList', $this->app->getURI(true), $this->app->openApp);
$objects = $this->doc->getOrderedObjects($type);
module/doc/lang/de.php
+1 -3
View File
@@ -70,15 +70,13 @@ $lang->doc->index = 'Home';
$lang->doc->create = 'Dokument hinzufügen';
$lang->doc->edit = 'Bearbeiten';
$lang->doc->delete = 'Löschen';
$lang->doc->createBook = 'Create Book';
$lang->doc->browse = 'Liste';
$lang->doc->view = 'Details';
$lang->doc->diff = 'Diff';
$lang->doc->diffAction = 'Diff Document';
$lang->doc->sort = 'Sortierung';
$lang->doc->manageType = 'Kategorie verwalten';
$lang->doc->createBook = 'Create Book';
$lang->doc->manageBook = 'Manage Book';
$lang->doc->editBook = 'Edit Book';
$lang->doc->editType = 'Bearbeiten';
$lang->doc->deleteType = 'Löschen';
$lang->doc->addType = 'Hinzufügen';
module/doc/lang/en.php
+2 -4
View File
@@ -71,15 +71,13 @@ $lang->doc->index = 'Document Home';
$lang->doc->create = 'Create Document';
$lang->doc->edit = 'Edit Document';
$lang->doc->delete = 'Delete Document';
$lang->doc->createBook = 'Create Book';
$lang->doc->browse = 'Document List';
$lang->doc->view = 'Document Detail';
$lang->doc->diff = 'Diff';
$lang->doc->diffAction = 'Diff Document';
$lang->doc->sort = 'Rank Document';
$lang->doc->manageType = 'Manage Category';
$lang->doc->createBook = 'Create Book';
$lang->doc->manageBook = 'Manage Book';
$lang->doc->editBook = 'Edit Book';
$lang->doc->editType = 'Edit';
$lang->doc->deleteType = 'Delete';
$lang->doc->addType = 'Add';
@@ -182,7 +180,7 @@ $lang->doc->noArticle = 'No articles.';
$lang->doc->noLib = 'No libraries. ';
$lang->doc->noBook = 'The WIKI library has not created a manual, please create a new one :)';
$lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
$lang->doc->notSetOffice = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
$lang->doc->notSetOffice = "<p>To create a %s document, you need to configure <a href='%s'>office convert</a>.<p>";
$lang->doc->noSearchedDoc = 'No documents found.';
$lang->doc->noEditedDoc = 'You have not edited any documents.';
$lang->doc->noOpenedDoc = 'You have not created any documents.';
module/doc/lang/fr.php
+1 -3
View File
@@ -70,15 +70,13 @@ $lang->doc->index = 'Accueil Documents';
$lang->doc->create = 'Ajouter Document';
$lang->doc->edit = 'Editer Document';
$lang->doc->delete = 'Supprimer Document';
$lang->doc->createBook = 'Create Book';
$lang->doc->browse = 'Liste Documents';
$lang->doc->view = 'Détail Document';
$lang->doc->diff = 'Diff';
$lang->doc->diffAction = 'Document Diff';
$lang->doc->sort = 'Rang Document';
$lang->doc->manageType = 'Gérer Catégories';
$lang->doc->createBook = 'Create Book';
$lang->doc->manageBook = 'Manage Book';
$lang->doc->editBook = 'Edit Book';
$lang->doc->editType = 'Editer';
$lang->doc->deleteType = 'Supprimer';
$lang->doc->addType = 'Ajouter';
module/doc/lang/vi.php
+1 -3
View File
@@ -70,15 +70,13 @@ $lang->doc->index = 'Document Home';
$lang->doc->create = 'Tạo tài liệu';
$lang->doc->edit = 'Sửa tài liệu';
$lang->doc->delete = 'Xóa tài liệu';
$lang->doc->createBook = 'Create Book';
$lang->doc->browse = 'Document danh sách';
$lang->doc->view = 'Document Detail';
$lang->doc->diff = 'Diff';
$lang->doc->diffAction = 'Diff tài liệu';
$lang->doc->sort = 'Đánh giá tài liệu';
$lang->doc->manageType = 'Quản lý danh mục';
$lang->doc->createBook = 'Create Book';
$lang->doc->manageBook = 'Manage Book';
$lang->doc->editBook = 'Edit Book';
$lang->doc->editType = 'Sửa';
$lang->doc->deleteType = 'Xóa';
$lang->doc->addType = 'Thêm';
module/doc/lang/zh-cn.php
+2 -4
View File
@@ -71,15 +71,13 @@ $lang->doc->index = '文档主页';
$lang->doc->create = '创建文档';
$lang->doc->edit = '编辑文档';
$lang->doc->delete = '删除文档';
$lang->doc->createBook = '创建手册';
$lang->doc->browse = '文档列表';
$lang->doc->view = '文档详情';
$lang->doc->diff = '对比';
$lang->doc->diffAction = '对比文档';
$lang->doc->sort = '文档排序';
$lang->doc->manageType = '维护目录';
$lang->doc->createBook = '创建手册';
$lang->doc->manageBook = '维护手册';
$lang->doc->editBook = '编辑手册';
$lang->doc->editType = '编辑目录';
$lang->doc->deleteType = '删除目录';
$lang->doc->addType = '增加目录';
@@ -182,7 +180,7 @@ $lang->doc->noArticle = '暂时没有文章。';
$lang->doc->noLib = '暂时没有文档库。';
$lang->doc->noBook = 'WIKI库还未创建手册，请新建 ：）';
$lang->doc->cannotCreateOffice = '<p>对不起，企业版才能创建%s文档。<p><p>试用企业版，请联系我们：4006-8899-23 &nbsp; 0532-86893032。</p>';
$lang->doc->notSetOffice = "<p>创建%s文档，需要配置<a href='%s' target='_parent'>Office转换设置</a>。<p>";
$lang->doc->notSetOffice = "<p>创建%s文档，需要配置<a href='%s'>Office转换设置</a>。<p>";
$lang->doc->noSearchedDoc = '没有搜索到任何文档。';
$lang->doc->noEditedDoc = '您还没有编辑任何文档。';
$lang->doc->noOpenedDoc = '您还没有创建任何文档。';
module/doc/model.php
+5 -3
View File
@@ -1652,7 +1652,7 @@ class docModel extends model
$actions .= "<ul class='dropdown-menu'>";
foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
{
$link = helper::createLink('doc', 'browse', "libID=0&browseTyp={$key}");
$link = helper::createLink('doc', 'browse', "libID=0&browseType={$key}");
$actions .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</li>';
}
$actions .='</ul>';
@@ -1813,7 +1813,8 @@ EOF;
$output .= "<div class='table-col'><div class='list-group'>";
foreach($objects as $key => $object)
{
$output .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "data-app='{$this->app->openApp}'");
$selected = $key == $objectID ? 'selected' : '';
$output .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
}
$output .= "</div></div></div></div></div>";
}
@@ -1825,7 +1826,8 @@ EOF;
$output .= "<div class='table-col'><div class='list-group'>";
foreach($libs as $key => $lib)
{
$output .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$key"), $lib->name, '', "data-app='{$this->app->openApp}'");
$selected = $key == $libID ? 'selected' : '';
$output .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$key"), $lib->name, '', "class='$selected' data-app='{$this->app->openApp}'");
}
$output .= "</div></div></div></div></div>";
}
module/doc/view/create.html.php
+1 -7
View File
@@ -20,13 +20,7 @@
</div>
<?php if(isset($this->config->bizVersion)):?>
<div class='alert alert-warning strong'>
<?php
$isonlybody = isonlybody();
unset($_GET['onlybody']);
printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');
if($isonlybody) $_GET['onlybody'] = 'yes';
?>
<?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?>
</div>
<?php else:?>
<div class='alert alert-warning strong'><?php printf($lang->doc->cannotCreateOffice, zget($lang->doc->typeList, $docType));?></div>
module/doc/view/index.html.php
+3 -3
View File
@@ -21,7 +21,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->orderByEdit;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseTyp=byediteddate"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=byediteddate"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
</nav>
</div>
<div class="panel-body has-table">
@@ -127,7 +127,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseTyp=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
</nav>
</div>
<div class="panel-body has-table">
@@ -159,7 +159,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->myCollection;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseTyp=collectedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=collectedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
</nav>
</div>
<div class="panel-body has-table">
module/doc/view/objectlibs.html.php
+12
View File
@@ -38,4 +38,16 @@
<?php endif;?>
</div>
<?php js::set('type', 'doc');?>
<script>
$('#pageNav .btn-group.angle-btn').click(function()
{
if($(this).hasClass('opened')) return;
$(this).addClass('opened');
setTimeout(function()
{
scrollToSelected();
}, 100);
})
</script>
<?php include '../../common/view/footer.html.php';?>
module/doc/view/view.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php echo css::internal($keTableCSS);?>
<style>.detail-content .file-image {padding: 0 50px 0 10px;}</style>
<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse', 'libID=0&browseTyp=byediteddate');?>
<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse', 'libID=0&browseType=byediteddate');?>
<?php
$sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&';
$sessionString .= session_name() . '=' . session_id();
module/execution/lang/en.php
-1
View File
@@ -194,7 +194,6 @@ $lang->execution->copy = "Copy {$lang->executionCommon}";
$lang->execution->delete = "Delete {$lang->executionCommon}";
$lang->execution->deleteAB = "Delete Execution";
$lang->execution->browse = "{$lang->executionCommon} List";
$lang->execution->list = "{$lang->executionCommon} List";
$lang->execution->edit = "Edit {$lang->executionCommon}";
$lang->execution->editAction = "Edit Execution";
$lang->execution->batchEdit = "Edit";
module/execution/lang/zh-cn.php
-1
View File
@@ -194,7 +194,6 @@ $lang->execution->copy = "复制{$lang->executionCommon}";
$lang->execution->delete = "删除{$lang->executionCommon}";
$lang->execution->deleteAB = "删除{$lang->execution->common}";
$lang->execution->browse = "浏览{$lang->execution->common}";
$lang->execution->list = "{$lang->executionCommon}列表";
$lang->execution->edit = "编辑{$lang->executionCommon}";
$lang->execution->editAction = "编辑{$lang->execution->common}";
$lang->execution->batchEdit = "编辑";
module/index/view/index.html.php
+6 -2
View File
@@ -127,5 +127,9 @@ js::set('defaultOpen', $open);
<?php js::set('searchAB', $lang->searchAB);?>
<?php js::set('searchObjectList', ',' . implode(',', array_keys($lang->searchObjects)) . ',');?>
<?php js::set('searchCommon', $lang->index->search);?>
<?php $config->noHiddenwin = true;?>
<?php include '../../common/view/footer.lite.html.php';?>
<script>
<?php if(isset($pageJS)) echo $pageJS;?>
</script>
</body>
</html>
module/my/control.php
+5 -8
View File
@@ -125,14 +125,11 @@ class my extends control
{
/* Save session. */
$uri = $this->app->getURI(true);
if($this->app->viewType != 'json')
{
$this->session->set('todoList', $uri, 'my');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');
$this->session->set('testtaskList', $uri, 'qa');
}
$this->session->set('todoList', $uri, 'my');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');
$this->session->set('testtaskList', $uri, 'qa');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
module/project/control.php
+1 -1
View File
@@ -612,7 +612,7 @@ class project extends control
$this->session->set('caseList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
if($this->config->maxVersion)
if(isset($this->config->maxVersion))
{
$this->session->set('riskList', $uri, 'project');
$this->session->set('issueList', $uri, 'project');
module/story/control.php
+1
View File
@@ -1513,6 +1513,7 @@ class story extends control
public function zeroCase($productID = 0, $branchID = 0, $orderBy = 'id_desc')
{
$this->session->set('storyList', $this->app->getURI(true) . '#app=' . $this->app->openApp, 'product');
$this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
$this->loadModel('testcase');
if($this->app->openApp == 'project')
module/task/control.php
+1 -1
View File
@@ -269,7 +269,7 @@ class task extends control
$storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('execution', 'story', "executionID=$executionID");
/* Set menu. */
$this->execution->setMenu($this->execution->getPairs(), $execution->id);
$this->execution->setMenu($execution->id);
/* When common task are child tasks, query whether common task are consumed. */
$taskConsumed = 0;
module/testtask/control.php
+1
View File
@@ -146,6 +146,7 @@ class testtask extends control
{
/* Save session. */
$this->session->set('testtaskList', $this->app->getURI(true), 'qa');
$this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
$this->session->set('buildList', $this->app->getURI(true) . '#app=' . $this->app->openApp, 'execution');
$this->loadModel('testcase');
$this->app->loadLang('tree');
www/js/my.full.js
+10 -4
View File
@@ -835,16 +835,22 @@ function adjustMenuWidth()
/**
* Scroll to selected item in drop menu.
*
* @param string $id
* @access public
* @return void
*/
function scrollToSelected()
function scrollToSelected(id)
{
$('#dropMenu .table-row .list-group').mouseout(function(){$(this).find('.active').removeClass('active')});
if($('#dropMenu .table-row .col-left .list-group .selected').length > 0)
if(typeof(id) == 'undefined') id = '#dropMenu .table-col .list-group'
$id = $(id);
$selected = $id.find('.selected');
$id.mouseout(function(){$(this).find('.active').removeClass('active')});
if($selected.length > 0)
{
var offsetHeight = 75;
$('#dropMenu .table-row .col-left .list-group').scrollTop($('#dropMenu .table-row .col-left .list-group .selected').position().top - offsetHeight);
$id.scrollTop($selected.position().top - offsetHeight);
}
}