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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-05-10 09:15:20 +08:00
parent 2ca5f8df02 7131213471
commit c898ba1ed8
27 changed files with 316 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/lang/en.php
+1
View File
@@ -16,6 +16,7 @@ $lang->backup->waitting = '<span id="backupType"></span>In Progree. Please
$lang->backup->confirmDelete = 'Do you want to delete the backup？';
$lang->backup->confirmRestore = 'Do you want to restore the backup？';
$lang->backup->holdDays = 'Backup the latest %s days.';
$lang->backup->restoreTip = 'Only attachments and databases will be restored when you click restore button, if you need to restore the code, you can restore manually.';
$lang->backup->success = new stdclass();
$lang->backup->success->backup = 'Backed up!';
module/block/control.php
+3 -4
View File
@@ -49,7 +49,6 @@ class block extends control
if(!common::hasPriv($moduleKey, 'index')) unset($modules[$moduleKey]);
}
if($this->config->global->flow != 'full') unset($modules['todo']);
if($this->config->global->flow == 'onlyTask' or $this->config->global->flow == 'onlyStory') unset($modules['qa']);
if($this->config->global->flow == 'onlyTask' or $this->config->global->flow == 'onlyTest') unset($modules['product']);
if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') unset($modules['project']);
@@ -210,9 +209,9 @@ class block extends control
foreach($blocks as $key => $block)
{
if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->block != 'dynamic') unset($blocks[$key]);
if($this->config->global->flow == 'onlyTask' and $block->source != 'project' and $block->block != 'dynamic') unset($blocks[$key]);
if($this->config->global->flow == 'onlyTest' and $block->source != 'qa' and $block->block != 'dynamic') unset($blocks[$key]);
if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
if($this->config->global->flow == 'onlyTask' and $block->source != 'project' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
if($this->config->global->flow == 'onlyTest' and $block->source != 'qa' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
$block->params = json_decode($block->params);
$blockID = $block->block;
module/common/lang/en.php
+203
View File
@@ -553,3 +553,206 @@ $lang->icons['unlock'] = 'unlock-alt';
$lang->icons['confirmStoryChange'] = 'search';
include (dirname(__FILE__) . '/menuOrder.php');
global $config;
if(isset($config->global->flow) and $config->global->flow == 'onlyStory')
{
/* Remove project, report and qa module. */
unset($lang->menu->project);
unset($lang->menu->report);
unset($lang->menu->qa);
unset($lang->menuOrder[15]);
unset($lang->menuOrder[20]);
unset($lang->menuOrder[30]);
/* Adjust sub menu of my dashboard. */
unset($lang->my->menu->bug);
unset($lang->my->menu->testtask);
unset($lang->my->menu->task);
unset($lang->my->menu->myProject);
/* Adjust sub menu of product module. */
unset($lang->product->menu->project);
/* Rename product module. */
$lang->menu->product = 'Product|product|index';
/* Adjust search items. */
unset($lang->searchObjects['bug']);
unset($lang->searchObjects['task']);
unset($lang->searchObjects['testcase']);
unset($lang->searchObjects['project']);
unset($lang->searchObjects['build']);
unset($lang->searchObjects['testtask']);
}
if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
{
/* Remove product, report and qa module. */
unset($lang->menu->product);
unset($lang->menu->report);
unset($lang->menu->qa);
unset($lang->menuOrder[10]);
unset($lang->menuOrder[20]);
unset($lang->menuOrder[30]);
/* Adjust sub menu of my dashboard. */
unset($lang->my->menu->bug);
unset($lang->my->menu->testtask);
unset($lang->my->menu->story);
/* Adjust sub menu of project module. */
unset($lang->project->menu->story);
unset($lang->project->menu->build);
unset($lang->project->menu->bug);
unset($lang->project->menu->testtask);
unset($lang->project->menu->product);
/* Remove sub menu of product module. */
unset($lang->product->menu);
unset($lang->product->menuOrder);
$lang->project->menu->task['subModule'] = 'task';
$lang->project->menu->task['alias'] = 'grouptask,importtask';
unset($lang->searchObjects['bug']);
unset($lang->searchObjects['story']);
unset($lang->searchObjects['product']);
unset($lang->searchObjects['testcase']);
unset($lang->searchObjects['build']);
unset($lang->searchObjects['release']);
unset($lang->searchObjects['productplan']);
unset($lang->searchObjects['testtask']);
}
if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
{
/* Remove project and test module. */
unset($lang->menu->project);
unset($lang->menu->qa);
unset($lang->menu->report);
unset($lang->menuOrder[15]);
unset($lang->menuOrder[20]);
unset($lang->menuOrder[30]);
/* Rename product module. */
$lang->menu->product = 'Product|product|index';
/* Adjust sub menu of my dashboard. */
unset($lang->my->menu->task);
unset($lang->my->menu->myProject);
unset($lang->my->menu->story);
/* Remove sub menu of project module. */
unset($lang->project->menu);
unset($lang->project->menuOrder);
/* Add bug, testcase and testtask module. */
$lang->menu->bug = 'Bug|bug|index';
$lang->menu->testcase = 'Case|testcase|index';
$lang->menu->testtask = 'Testing|testtask|index';
$lang->menu->caselib = 'Library|testsuite|library';
$lang->menuOrder[6] = 'bug';
$lang->menuOrder[7] = 'testcase';
$lang->menuOrder[8] = 'testtask';
$lang->menuOrder[9] = 'caselib';
/* Adjust sub menu of bug module. */
$lang->bug->menu = new stdclass();
$lang->bug->menu->product = '%s';
$lang->bug->menu->browse = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->bug->menu->create = array('link' => 'Create Bug|bug|create|productID=%s');
$lang->bug->menuOrder[5] = 'product';
$lang->bug->menuOrder[10] = 'browse';
$lang->bug->menuOrder[15] = 'create';
/* Adjust sub menu of testcase. */
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->product = '%s';
$lang->testcase->menu->browse = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
$lang->testcase->menuOrder[5] = 'product';
$lang->testcase->menuOrder[10] = 'browse';
$lang->testcase->menuOrder[15] = 'testsuite';
/* Adjust sub menu of bug module. */
$lang->testsuite->menu = new stdclass();
$lang->testsuite->menu->product = '%s';
$lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testsuite->menu->browse = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
$lang->testsuite->menuOrder[5] = 'product';
$lang->testsuite->menuOrder[10] = 'testcase';
$lang->testsuite->menuOrder[15] = 'browse';
/* Adjust sub menu of testtask. */
$lang->testtask->menu = new stdclass();
$lang->testtask->menu->product = '%s';
$lang->testtask->menu->browse = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testtask->menu->create = array('link' => 'Create Test|testtask|create|productID=%s');
$lang->testtask->menu->report = array('link' => 'Report|testreport|browse');
$lang->testtask->menuOrder[5] = 'product';
$lang->testtask->menuOrder[10] = 'browse';
$lang->testtask->menuOrder[15] = 'create';
$lang->testtask->menuOrder[20] = 'report';
/* Adjust sub menu of caselib module. */
$lang->caselib->menu = new stdclass();
$lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true);
$lang->caselib->menu->caselib = array('link' => 'Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
$lang->caselib->menu->createlib = array('link' => "<i class='icon-plus'></i>Create Library|testsuite|createLib|", 'float' => 'right');
/* Adjust sub menu of report module. */
$lang->testreport->menu = new stdclass();
$lang->testreport->menu->product = '%s';
$lang->testreport->menu->browse = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testreport->menu->create = array('link' => 'Create Test|testtask|create|productID=%s');
$lang->testreport->menu->report = array('link' => 'Report|testreport|browse');
$lang->testreport->menuOrder[5] = 'product';
$lang->testreport->menuOrder[10] = 'browse';
$lang->testreport->menuOrder[15] = 'create';
$lang->testreport->menuOrder[20] = 'report';
/* Adjust sub menu of product module. */
unset($lang->product->menu->story);
unset($lang->product->menu->project);
unset($lang->product->menu->release);
unset($lang->product->menu->dynamic);
unset($lang->product->menu->plan);
unset($lang->product->menu->roadmap);
unset($lang->product->menu->doc);
unset($lang->product->menu->module);
$lang->product->menu->build = array('link' => 'Build|product|build', 'subModule' => 'build');
$lang->product->menuOrder[5] = 'build';
$lang->product->menuOrder[10] = 'view';
$lang->product->menuOrder[15] = 'order';
$lang->build->menu = $lang->product->menu;
$lang->build->menuOrder = $lang->product->menuOrder;
/* Adjust menu group. */
$lang->menugroup->bug = 'bug';
$lang->menugroup->testcase = 'testcase';
$lang->menugroup->testtask = 'testtask';
$lang->menugroup->testsuite = 'caselib';
$lang->menugroup->testreport = 'testtask';
$lang->menugroup->build = 'product';
/* Adjust search objects. */
unset($lang->searchObjects['story']);
unset($lang->searchObjects['task']);
unset($lang->searchObjects['release']);
unset($lang->searchObjects['productplan']);
$lang->zentaoPMS = 'zentao test';
}
module/common/lang/zh-cn.php
+34 -32
View File
@@ -568,7 +568,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory')
/* Adjust sub menu of my dashboard. */
unset($lang->my->menu->bug);
unset($lang->my->menu->todo);
unset($lang->my->menu->testtask);
unset($lang->my->menu->task);
unset($lang->my->menu->myProject);
@@ -601,7 +600,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
/* Adjust sub menu of my dashboard. */
unset($lang->my->menu->bug);
unset($lang->my->menu->todo);
unset($lang->my->menu->testtask);
unset($lang->my->menu->story);
@@ -647,25 +645,21 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
unset($lang->my->menu->task);
unset($lang->my->menu->myProject);
unset($lang->my->menu->story);
unset($lang->my->menu->todo);
/* Remove sub menu of project module. */
unset($lang->project->menu);
unset($lang->project->menuOrder);
/* Add bug, testcase and testtask module. */
$lang->menu->bug = 'Bug|bug|index';
$lang->menu->testcase = '用例|testcase|index';
$lang->menu->testtask = '测试|testtask|index';
$lang->menu->testsuite = '套件|testsuite|index';
$lang->menu->testreport = '报告|testreport|browse';
$lang->menu->bug = 'Bug|bug|index';
$lang->menu->testcase = '用例|testcase|index';
$lang->menu->testtask = '测试|testtask|index';
$lang->menu->caselib = '用例库|testsuite|library';
$lang->menuOrder[6] = 'bug';
$lang->menuOrder[7] = 'testcase';
$lang->menuOrder[8] = 'testtask';
$lang->menuOrder[9] = 'testsuite';
$lang->menuOrder[10] = 'testreport';
$lang->menuOrder[11] = 'product';
$lang->menuOrder[6] = 'bug';
$lang->menuOrder[7] = 'testcase';
$lang->menuOrder[8] = 'testtask';
$lang->menuOrder[9] = 'caselib';
/* Adjust sub menu of bug module. */
$lang->bug->menu = new stdclass();
@@ -679,45 +673,53 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Adjust sub menu of testcase. */
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->product = '%s';
$lang->testcase->menu->browse = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testcase->menu->create = array('link' => '创建用例|testcase|create|productID=%s');
$lang->testcase->menu->product = '%s';
$lang->testcase->menu->browse = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testcase->menu->testsuite = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
$lang->testcase->menuOrder[5] = 'product';
$lang->testcase->menuOrder[10] = 'browse';
$lang->testcase->menuOrder[15] = 'create';
$lang->testcase->menuOrder[15] = 'testsuite';
/* Adjust sub menu of bug module. */
$lang->testsuite->menu = new stdclass();
$lang->testsuite->menu->product = '%s';
$lang->testsuite->menu->testcase = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testsuite->menu->browse = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
$lang->testsuite->menuOrder[5] = 'product';
$lang->testsuite->menuOrder[10] = 'testcase';
$lang->testsuite->menuOrder[15] = 'browse';
/* Adjust sub menu of testtask. */
$lang->testtask->menu = new stdclass();
$lang->testtask->menu->product = '%s';
$lang->testtask->menu->browse = array('link' => '浏览版本|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testtask->menu->create = array('link' => '提交测试|testtask|create|productID=%s');
$lang->testtask->menu->report = array('link' => '报告|testreport|browse');
$lang->testtask->menuOrder[5] = 'product';
$lang->testtask->menuOrder[10] = 'browse';
$lang->testtask->menuOrder[15] = 'create';
/* Adjust sub menu of bug module. */
$lang->testsuite->menu = new stdclass();
$lang->testsuite->menu->product = '%s';
$lang->testsuite->menu->browse = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,edit,view');
$lang->testsuite->menu->caselib = array('link' => '用例库|testsuite|library', 'alias' => 'createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
$lang->testsuite->menuOrder[5] = 'product';
$lang->testsuite->menuOrder[10] = 'browse';
$lang->testsuite->menuOrder[15] = 'create';
$lang->testtask->menuOrder[20] = 'report';
/* Adjust sub menu of caselib module. */
$lang->caselib->menu = new stdclass();
$lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true);
$lang->caselib->menu->testsuite = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,edit,view');
$lang->caselib->menu->caselib = array('link' => '用例库|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
$lang->caselib->menu->createlib = array('link' => "<i class='icon-plus'></i>创建库|testsuite|createLib|", 'float' => 'right');
/* Adjust sub menu of report module. */
$lang->testreport->menu = new stdclass();
$lang->testreport->menu->product = '%s';
$lang->testreport->menu->browse = array('link' => '浏览报告|testreport|browse|productID=%s', 'alias' => 'create,edit,view');
$lang->testreport->menu->browse = array('link' => '浏览版本|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
$lang->testreport->menu->create = array('link' => '提交测试|testtask|create|productID=%s');
$lang->testreport->menu->report = array('link' => '报告|testreport|browse');
$lang->testreport->menuOrder[5] = 'product';
$lang->testreport->menuOrder[10] = 'browse';
$lang->testreport->menuOrder[15] = 'create';
$lang->testreport->menuOrder[20] = 'report';
/* Adjust sub menu of product module. */
unset($lang->product->menu->story);
@@ -742,8 +744,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
$lang->menugroup->bug = 'bug';
$lang->menugroup->testcase = 'testcase';
$lang->menugroup->testtask = 'testtask';
$lang->menugroup->testsuite = 'testsuite';
$lang->menugroup->testreport = 'testreport';
$lang->menugroup->testsuite = 'caselib';
$lang->menugroup->testreport = 'testtask';
$lang->menugroup->build = 'product';
/* Adjust search objects. */
module/common/view/chart.html.php
+3 -1
View File
@@ -138,7 +138,9 @@ if($config->debug)
$(function()
{
$('.table-chart').tableChart();
$('.progress-pie').progressPie();
var $pies = $('.progress-pie');
if($pies.length > 100) setTimeout(function(){$pies.progressPie();}, 1000);
else $pies.progressPie();
});
}());
</script>
module/common/view/footer.html.php
+1 -1
View File
@@ -25,7 +25,7 @@ function ajaxIgnoreBrowser(){$.get(createLink('misc', 'ajaxIgnoreBrowser'));}
$(function(){showBrowserNotice()});
<?php endif;?>
<?php if(!isset($config->global->novice) and $this->loadModel('tutorial')->checkNovice()):?>
<?php if(!isset($config->global->novice) and $this->loadModel('tutorial')->checkNovice() and $config->global->flow == 'full'):?>
novice = confirm('<?php echo $lang->tutorial->novice?>');
$.get(createLink('tutorial', 'ajaxSaveNovice', 'novice=' + (novice ? 'true' : 'false')), function()
{
module/doc/lang/en.php
+6
View File
@@ -82,6 +82,12 @@ $lang->doc->libTypeList['custom'] = 'Custom Library';
$lang->doc->systemLibs['product'] = $lang->productCommon . 'DocumentLibrary';
$lang->doc->systemLibs['project'] = $lang->projectCommon . 'DocumentLibrary';
global $config;
if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']);
if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']);
if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']);
if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']);
$lang->doc->aclList['open'] = 'Public';
$lang->doc->aclList['custom'] = 'Custom';
$lang->doc->aclList['private'] = 'Private';
module/doc/lang/zh-cn.php
-1
View File
@@ -88,7 +88,6 @@ if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest')
if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']);
if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']);
$lang->doc->aclList['open'] = '公开';
$lang->doc->aclList['custom'] = '自定义';
$lang->doc->aclList['private'] = '私有';
module/file/lang/en.php
+6
View File
@@ -26,12 +26,18 @@ $lang->file->exportFields = "Fileds to be Exported";
$lang->file->defaultTPL = "Default Template";
$lang->file->setExportTPL = "Settings";
$lang->file->preview = "Preview";
$lang->file->addFile = 'Add File';
$lang->file->beginUpload = 'Start uploading';
$lang->file->uploadSuccess = 'uploaded Successfully';
$lang->file->dragFile = 'Please drag here.';
$lang->file->errorNotExists = "<span class='red'>'%s' is not found.</span>";
$lang->file->errorCanNotWrite = "<span class='red'>'%s' is not writable. Please change its permission. Enter sudo chmod -R 777 '%s'</span> in Linux.";
$lang->file->confirmDelete = " Do you want to delete it?";
$lang->file->errorFileSize = " File size exceeds the limit. It cannot be uploaded!";
$lang->file->errorFileUpload = " Uploading failed. File size might exceeds the limit.";
$lang->file->errorFileFormate = " Uploading failed, file format is limited.";
$lang->file->errorFileMove = " Uploading failed, there was an error when moving file.";
$lang->file->dangerFile = " File has been rejected to upload for security issues.";
$lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!';
$lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.';
module/install/lang/en.php
+6
View File
@@ -81,10 +81,16 @@ $lang->install->dbName = 'Database Library';
$lang->install->dbPrefix = 'Database Table Prefix';
$lang->install->clearDB = 'Clear Database';
$lang->install->importDemoData = 'Import Demo Data';
$lang->install->working = 'Working way';
$lang->install->requestTypes['GET'] = 'GET';
$lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
$lang->install->workingList['full'] = 'Full';
$lang->install->workingList['onlyTest'] = 'Only Test';
$lang->install->workingList['onlyStory'] = 'Only Story';
$lang->install->workingList['onlyTask'] = 'Only Task';
$lang->install->errorConnectDB = 'Connection to database Failed. ';
$lang->install->errorDBName = 'Database name should exclude “.” ';
$lang->install->errorCreateDB = 'Database creation failed.';
module/product/js/common.js
+1 -1
View File
@@ -5,5 +5,5 @@ function setWhite(acl)
$(document).ready(function()
{
if(noProject) $('#aclprivate').parents('.radio').remove();
if(window.noProject) $('#aclprivate').parents('.radio').remove();
})
module/product/lang/en.php
+1
View File
@@ -40,6 +40,7 @@ $lang->product->builds = 'Builds';
$lang->product->roadmap = 'Roadmap';
$lang->product->doc = 'Documents';
$lang->product->project = $lang->projectCommon . 'List';
$lang->product->build = 'Build List';
$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?";
module/project/lang/en.php
+7
View File
@@ -262,3 +262,10 @@ $lang->project->treeLevel['root'] = 'Show Root';
$lang->project->treeLevel['story'] = 'Show Story';
$lang->project->treeLevel['task'] = 'Show Task';
$lang->project->treeLevel['all'] = 'Show All';
global $config;
if($config->global->flow == 'onlyTask')
{
unset($lang->project->groups['story']);
unset($lang->project->featureBar['task']['needconfirm']);
}
module/testsuite/control.php
+4 -3
View File
@@ -51,13 +51,14 @@ class testsuite extends control
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
$productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->common;
$this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->title = $productName . $this->lang->testsuite->common;
$this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $productName);
$this->view->position[] = $this->lang->testsuite->common;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->productName = $productName;
$this->view->orderBy = $orderBy;
$this->view->suites = $this->testsuite->getSuites($productID, $sort, $pager);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
module/testsuite/js/common.js
+8
View File
@@ -0,0 +1,8 @@
$(document).ready(function()
{
if(onlyTest)
{
$('#mainmenu > .nav > li').removeClass('active');
$('#mainmenu > .nav > li[data-id=testcase]').addClass('active');
}
})
module/testsuite/lang/en.php
+2
View File
@@ -20,6 +20,8 @@ $lang->testsuite->linkVersion = "Version";
$lang->testsuite->unlinkCase = "Unlink";
$lang->testsuite->batchUnlinkCases = "Batch unlink cases";
$lang->testsuite->deleted = 'deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->importFile = 'Import CSV';
$lang->testsuite->common = 'Test Suite';
$lang->testsuite->product = $lang->productCommon;
module/testsuite/view/browse.html.php
+1
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php js::set('confirmDelete', $lang->testsuite->confirmDelete)?>
<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
<div id="titlebar">
<div class="heading"> <?php echo $lang->testsuite->browse?> </div>
<div class="actions"><?php common::printIcon('testsuite', 'create', "product=$productID");?></div>
module/testsuite/view/create.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
<div class='container mw-1400px'>
<div id='titlebar'>
<div class='heading'>
module/testsuite/view/edit.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
<div class='container mw-1400px'>
<div id='titlebar'>
<div class='heading'>
module/testsuite/view/linkcase.html.php
+1
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'> <strong><?php echo $suite->id;?></strong></span>
module/testsuite/view/view.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlink', $lang->testsuite->confirmUnlinkCase)?>
<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='TESTSUITE'><strong><?php echo $suite->id;?></strong></span>
module/todo/lang/en.php
+4
View File
@@ -57,6 +57,10 @@ $lang->todo->typeList['custom'] = 'Custom';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . 'Task';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']);
$lang->todo->confirmDelete = "Are you sure to delete this To-Do?";
$lang->todo->thisIsPrivate = 'This is a private To-Do:)';
$lang->todo->lblDisableDate = 'Set later.';
module/todo/lang/zh-cn.php
+4
View File
@@ -57,6 +57,10 @@ $lang->todo->typeList['custom'] = '自定义';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任务';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']);
$lang->todo->confirmDelete = "您确定要删除这条待办吗？";
$lang->todo->thisIsPrivate = '这是一条私人事务。:)';
$lang->todo->lblDisableDate = '暂时不设定时间';
module/todo/model.php
+5 -3
View File
@@ -323,6 +323,10 @@ class todoModel extends model
while($todo = $stmt->fetch())
{
if($this->config->global->flow == 'onlyTest' and $todo->type == 'task') continue;
if($this->config->global->flow == 'onlyTask' and $todo->type == 'bug') continue;
if($this->config->global->flow == 'onlyStory' and $todo->type != 'custom') continue;
if($todo->type == 'task') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
if($todo->type == 'bug') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
$todo->begin = date::formatTime($todo->begin);
@@ -330,6 +334,7 @@ class todoModel extends model
/* If is private, change the title to private. */
if($todo->private and $this->app->user->account != $todo->account) $todo->name = $this->lang->todo->thisIsPrivate;
$todos[] = $todo;
}
return $todos;
@@ -352,6 +357,3 @@ class todoModel extends model
return true;
}
}
module/user/css/deny.css
+2
View File
@@ -13,3 +13,5 @@ body{background: #f1f1f1;}
.alert {display: table;}
.btn {transition:none;}
.body-modal .modal-dialog {margin: 50px auto; border: none; box-shadow: none;}
module/user/css/login.css
+3
View File
@@ -18,3 +18,6 @@ body{background-color: #036}
.popover {max-width: 500px}
.popover-content {padding: 0; width: 297px}
.btn-submit {min-width: 70px}
.body-modal #container {margin: 0;}
.body-modal {padding: 40px 0 25px;}
www/js/zui/min.js
+7 -7
View File
File diff suppressed because one or more lines are too long