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

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

Browse Source
This commit is contained in:
Yagami
2019-04-19 13:03:57 +08:00
parent 0bcb41f489 a60f376f1f
commit 37ef2e5dab
10 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/en.php
+5 -5
View File
@@ -36,7 +36,7 @@ $lang->block->lblFlowchart = 'Flowchart';
$lang->block->welcome = 'Welcome';
$lang->block->lblTesttask = 'Testing Details';
$lang->block->leftToday = 'Work for Today';
$lang->block->leftToday = 'Remaining Work Report';
$lang->block->myTask = 'My Task';
$lang->block->myStory = 'My Story';
$lang->block->myBug = 'My Bug';
@@ -143,7 +143,7 @@ $lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
$lang->block->default['qa']['4']['title'] = 'Wait Build';
$lang->block->default['qa']['4']['title'] = 'Pending Build';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 4;
@@ -356,12 +356,12 @@ $lang->block->typeList->product['closed'] = 'Closed';
$lang->block->typeList->product['all'] = 'All';
$lang->block->typeList->product['involved'] = 'Involved';
$lang->block->typeList->project['undone'] = 'Unfinished';
$lang->block->typeList->project['doing'] = 'Doing';
$lang->block->typeList->project['undone'] = 'Uncompleted';
$lang->block->typeList->project['doing'] = 'Ongoing';
$lang->block->typeList->project['all'] = 'All';
$lang->block->typeList->project['involved'] = 'Involved';
$lang->block->typeList->testtask['wait'] = 'Wait';
$lang->block->typeList->testtask['wait'] = 'Pending';
$lang->block->typeList->testtask['doing'] = 'Doing';
$lang->block->typeList->testtask['blocked'] = 'Blocked';
$lang->block->typeList->testtask['done'] = 'Done';
module/common/lang/en.php
+8 -8
View File
@@ -21,7 +21,7 @@ $lang->percent = '%';
$lang->dash = '-';
$lang->zentaoPMS = 'ZenTao';
$lang->welcome = "%s PMS";
$lang->welcome = "%s";
$lang->logout = 'Logout';
$lang->login = 'Login';
$lang->help = 'Help';
@@ -59,7 +59,7 @@ $lang->required = 'Required';
$lang->noData = 'No data.';
$lang->actions = 'Action';
$lang->restore = 'Restore';
$lang->restore = 'Reset';
$lang->comment = 'Note';
$lang->history = 'History';
$lang->attatch = 'File';
@@ -142,7 +142,7 @@ $lang->searchObjects['productplan'] = $lang->productCommon . 'Plan';
$lang->searchObjects['testtask'] = 'Test';
$lang->searchObjects['doc'] = 'Doc';
$lang->searchObjects['testsuite'] = 'Case Library';
$lang->searchObjects['testreport'] = 'Test Report';
$lang->searchObjects['testreport'] = 'Testing Report';
$lang->searchTips = 'ID (ctrl+g)';
/* Code formats for import. */
@@ -186,7 +186,7 @@ $lang->my->menu->index = 'Home|my|index';
$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
$lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task');
$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
$lang->my->menu->testtask = array('link' => 'Test Task|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
$lang->my->menu->testtask = array('link' => 'Test|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
$lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story');
$lang->my->menu->myProject = "{$lang->projectCommon}|my|project|";
$lang->my->menu->dynamic = 'Dynamic|my|dynamic|';
@@ -307,7 +307,7 @@ $lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
$lang->testsuite->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s');
$lang->testsuite->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s');
$lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
$lang->testsuite->menu->report = array('link' => 'Report|testreport|browse|productID=%s');
$lang->testsuite->menu->caselib = array('link' => 'Case Library|testsuite|library');
@@ -808,7 +808,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Adjust sub menu of testcase. */
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->all = 'All|testcase|browse|productID=%s&branch=%s&browseType=all';
$lang->testcase->menu->wait = 'Wait|testcase|browse|productID=%s&branch=%s&browseType=wait';
$lang->testcase->menu->wait = 'Pending|testcase|browse|productID=%s&branch=%s&browseType=wait';
$lang->testcase->menu->bysuite = array('link' => 'Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testcase->subMenu = new stdclass();
@@ -828,7 +828,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Adjust sub menu of testtask. */
$lang->testtask->menu = new stdclass();
$lang->testtask->menu->totalStatus = 'All|testtask|browse|productID=%s&branch=%s&type=%s,totalStatus';
$lang->testtask->menu->wait = 'Wait|testtask|browse|productID=%s&branch=%s&type=%s,wait';
$lang->testtask->menu->wait = 'Pending|testtask|browse|productID=%s&branch=%s&type=%s,wait';
$lang->testtask->menu->doing = 'Doing|testtask|browse|productID=%s&branch=%s&type=%s,doing';
$lang->testtask->menu->blocked = 'Blocked|testtask|browse|productID=%s&branch=%s&type=%s,blocked';
$lang->testtask->menu->done = 'Done|testtask|browse|productID=%s&branch=%s&type=%s,done';
@@ -849,7 +849,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Adjust sub menu of caselib module. */
$lang->caselib->menu = new stdclass();
$lang->caselib->menu->all = 'All|testsuite|library|libID=%s&browseType=all';
$lang->caselib->menu->wait = 'Wait|testsuite|library|libID=%s&browseType=wait';
$lang->caselib->menu->wait = 'Pending|testsuite|library|libID=%s&browseType=wait';
$lang->caselib->menu->view = 'View|testsuite|libview|libID=%s';
$lang->caselib->menuOrder[5] = 'lib';
module/product/lang/en.php
+3 -3
View File
@@ -11,8 +11,8 @@
*/
$lang->product->common = $lang->productCommon;
$lang->product->index = $lang->productCommon . 'Home';
$lang->product->browse = 'Story List';
$lang->product->dynamic = 'Dynamic';
$lang->product->browse = 'Story';
$lang->product->dynamic = 'Dynamics';
$lang->product->view = 'Overview';
$lang->product->edit = "Edit {$lang->productCommon}";
$lang->product->batchEdit = 'Batch Edit';
@@ -74,7 +74,7 @@ $lang->product->qa = 'QA';
$lang->product->release = 'Release';
$lang->product->allRelease = 'All Release';
$lang->product->maintain = 'Maintaining';
$lang->product->latestDynamic = 'Dynamic';
$lang->product->latestDynamic = 'Dynamics';
$lang->product->plan = 'Plan';
$lang->product->iteration = 'Build Iteration';
$lang->product->iterationInfo = '%s Iteration';
module/project/control.php
+1 -1
View File
@@ -1780,7 +1780,7 @@ class project extends control
$this->loadModel('dept');
$project = $this->project->getById($projectID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst');
$users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
$currentMembers = $this->project->getTeamMembers($projectID);
module/project/lang/en.php
+8 -8
View File
@@ -57,12 +57,12 @@ $lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "No {$lang->productCommon}";
$lang->project->createStory = "Create Story";
$lang->project->all = 'All';
$lang->project->undone = 'Unfinished';
$lang->project->undone = 'Uncompleted';
$lang->project->unclosed = 'Unclosed';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->typeDesc = 'No story, bug, build, test task or Burndown is allowed in OPS';
$lang->project->mine = 'My Responsibility: ';
$lang->project->mine = 'My: ';
=======
$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS';
=======
@@ -123,7 +123,7 @@ $lang->project->basicInfo = 'Basic Info';
$lang->project->otherInfo = 'Other Info';
/* 字段取值列表。*/
$lang->project->statusList['wait'] = 'Wait';
$lang->project->statusList['wait'] = 'Pending';
$lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspend';
$lang->project->statusList['closed'] = 'Closed';
@@ -205,11 +205,11 @@ $lang->project->viewAll = 'View All';
/* 分组浏览。*/
$lang->project->allTasks = 'All';
$lang->project->assignedToMe = 'Mine';
$lang->project->assignedToMe = 'My';
$lang->project->myInvolved = 'Involved';
$lang->project->statusSelects[''] = 'More';
$lang->project->statusSelects['wait'] = 'Wait';
$lang->project->statusSelects['wait'] = 'Pending';
$lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
$lang->project->statusSelects['done'] = 'Done';
@@ -229,7 +229,7 @@ $lang->project->groupFilter['story']['all'] = $lang->project->all;
$lang->project->groupFilter['story']['linked'] = 'LinkedtoStory Task';
$lang->project->groupFilter['pri']['all'] = $lang->project->all;
$lang->project->groupFilter['pri']['noset'] = 'Not set';
$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
$lang->project->groupFilter['assignedTo']['undone'] = 'Uncompleted';
$lang->project->groupFilter['assignedTo']['all'] = $lang->project->all;
$lang->project->byQuery = 'Search';
@@ -338,7 +338,7 @@ $lang->project->fixFirstWithLeft = 'Modify the left';
$lang->project->action = new stdclass();
$lang->project->action->opened = '$date, created by <strong>$actor</strong> .' . "\n";
$lang->project->action->managed = '$date, managed by <strong>$actor</strong> .' . "\n";
$lang->project->action->extra = 'The related products are %s.';
$lang->project->action->extra = 'The linked products are %s.';
/* 统计。*/
$lang->project->charts = new stdclass();
@@ -385,7 +385,7 @@ $lang->project->kanbanShowOption = 'Unfold';
$lang->project->kanbanColsColor = 'Custom column color';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Do you want to restore the default settings of Kanban?';
$lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?';
$lang->kanbanSetting->optionList['0'] = 'Hide';
$lang->kanbanSetting->optionList['1'] = 'Show';
module/task/lang/en.php
+4 -4
View File
@@ -65,7 +65,7 @@ $lang->task->hour = 'Hour';
$lang->task->consumedThisTime = 'Cost';
$lang->task->leftThisTime = 'Left';
$lang->task->datePlan = 'Plan';
$lang->task->estStarted = 'Planne Start';
$lang->task->estStarted = 'Planned Start';
$lang->task->realStarted = 'Actual Start';
$lang->task->date = 'Date';
$lang->task->deadline = 'Planned End';
@@ -119,13 +119,13 @@ $lang->task->selectTestStory = 'Select Test Story';
$lang->task->selectAllUser = 'All';
$lang->task->noStory = 'No Story';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Unfinished';
$lang->task->noFinished = 'Uncompleted';
$lang->task->noClosed = 'Unclosed';
$lang->task->yesterdayFinished = 'Task Finished Yesterday';
$lang->task->allTasks = 'Task';
$lang->task->statusList[''] = '';
$lang->task->statusList['wait'] = 'Wait';
$lang->task->statusList['wait'] = 'Pending';
$lang->task->statusList['doing'] = 'Doing';
$lang->task->statusList['done'] = 'Done';
$lang->task->statusList['pause'] = 'Paused';
@@ -195,7 +195,7 @@ $lang->task->report = new stdclass();
$lang->task->report->common = 'Report';
$lang->task->report->select = 'Group by';
$lang->task->report->create = 'Create';
$lang->task->report->value = 'Task Count';
$lang->task->report->value = 'Tasks';
$lang->task->report->charts['tasksPerProject'] = 'by ' . $lang->projectCommon;
$lang->task->report->charts['tasksPerModule'] = 'by Module';
module/testcase/lang/en.php
+12 -12
View File
@@ -55,19 +55,19 @@ $lang->testcase->allProduct = "All {$lang->productCommon}";
$lang->testcase->fromBug = 'From Bug';
$lang->testcase->toBug = 'To Bug';
$lang->testcase->changed = 'Changed';
$lang->testcase->bugs = 'Bugs Reported';
$lang->testcase->bugs = 'Reported Bugs';
$lang->testcase->bugsAB = 'B';
$lang->testcase->results = 'Results';
$lang->testcase->resultsAB = 'R';
$lang->testcase->stepNumber = 'No.. of steps';
$lang->testcase->stepNumber = 'No. of steps';
$lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = 'Convert to Bug';
$lang->testcase->fromModule = 'Source Module';
$lang->testcase->fromCase = 'Source Case';
$lang->testcase->sync = 'Sync Case';
$lang->testcase->ignore = 'Ignore';
$lang->testcase->fromTesttask = 'From Testtask';
$lang->testcase->fromCaselib = 'From Caselib';
$lang->testcase->fromTesttask = 'From Test';
$lang->testcase->fromCaselib = 'From CaseLib';
$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
$lang->testcase->stepID = 'ID';
@@ -105,7 +105,7 @@ $lang->testcase->export = "Export Data";
$lang->testcase->reportChart = 'Report Chart';
$lang->testcase->confirmChange = 'Confirm Case Change';
$lang->testcase->confirmStoryChange = 'Confirm Story Change';
$lang->testcase->copy = 'Duplicate Case';
$lang->testcase->copy = 'Copy Case';
$lang->testcase->group = 'Group';
$lang->testcase->groupName = 'Group Name';
$lang->testcase->step = 'Step';
@@ -131,7 +131,7 @@ $lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'Changed Story';
>>>>>>> 1f8899a84819dad5ffe811c8eb667fd33e01136f
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Wait';
$lang->testcase->unexecuted = 'Pending';
$lang->testcase->lblStory = 'Story';
$lang->testcase->lblLastEdited = 'Last Edit';
@@ -172,7 +172,7 @@ $lang->testcase->typeList['other'] = 'Other';
$lang->testcase->stageList[''] = '';
$lang->testcase->stageList['unittest'] = 'Unit Test';
$lang->testcase->stageList['feature'] = 'Function Test';
$lang->testcase->stageList['feature'] = 'Feature Test';
$lang->testcase->stageList['intergrate'] = 'Integration Test';
$lang->testcase->stageList['system'] = 'System Test';
$lang->testcase->stageList['smoke'] = 'Smoking Test';
@@ -195,12 +195,12 @@ $lang->testcase->resultList['blocked'] = 'Blocked';
$lang->testcase->buttonToList = 'Back';
$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!';
$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!';
$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank.";
$lang->testcase->errorEncode = 'No data. Please select right encoding and upload again!';
$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot change the data into the required one!';
$lang->testcase->noRequire = "Row %s has“%s ”which is a required field and it should not be blank.";
$lang->testcase->noLibrary = "No library exists. Please create one first.";
$lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->testcase->noModule = '<div>You have no modules.</div><div>Manage now</div>';
$lang->testcase->noCase = 'No cases. ';
$lang->testcase->searchStories = 'Enter to search Story';
@@ -211,7 +211,7 @@ $lang->testcase->action->fromlib = array('main' => '$date, imported by <strong>
$lang->testcase->action->reviewed = array('main' => '$date, recorded by <strong>$actor</strong> and the review result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
$lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases;
$lang->testcase->featureBar['browse']['wait'] = 'Wait';
$lang->testcase->featureBar['browse']['wait'] = 'Pending';
$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
$lang->testcase->featureBar['browse']['group'] = '';
$lang->testcase->featureBar['browse']['suite'] = 'Suite';
module/testsuite/lang/en.php
+9 -9
View File
@@ -16,22 +16,22 @@ $lang->testsuite->view = "Overview";
$lang->testsuite->edit = "Edit";
$lang->testsuite->browse = "Suite List";
$lang->testsuite->linkCase = "Link Case";
$lang->testsuite->linkVersion = "Version";
$lang->testsuite->linkVersion = "Build";
$lang->testsuite->unlinkCase = "Unlink";
<<<<<<< HEAD
$lang->testsuite->batchUnlinkCases = "Batch unlink case";
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->batchCreateCase = 'Batch create case';
$lang->testsuite->exportTemplet = 'Export Template';
$lang->testsuite->batchCreateCase = 'Batch Create Case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Show imported data';
$lang->testsuite->showImport = 'Imported Data';
=======
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->exportTemplet = 'Export Template';
$lang->testsuite->batchCreateCase = 'Batch Create Case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Show Imported Data';
$lang->testsuite->showImport = 'Imported Data';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testsuite->successSaved = 'Saved';
@@ -40,7 +40,7 @@ $lang->testsuite->product = $lang->productCommon;
$lang->testsuite->name = 'Name';
$lang->testsuite->desc = 'Description';
$lang->testsuite->author = 'Access Control';
$lang->testsuite->addedBy = 'Creator';
$lang->testsuite->addedBy = 'By';
$lang->testsuite->addedDate = 'Date';
$lang->testsuite->legendDesc = 'Description';
@@ -66,6 +66,6 @@ $lang->caselib->all = 'All';
$lang->testsuite->createLib = 'Create Library';
$lang->testsuite->editLib = 'Edit';
$lang->testsuite->library = 'View cases in Library';
$lang->testsuite->library = 'View cases in a library';
$lang->testsuite->createCase = 'Create Case';
$lang->testsuite->libView = 'Overview';
module/todo/lang/en.php
+2 -2
View File
@@ -64,7 +64,7 @@ $lang->todo->confirmBug = 'This Todo is linked to Bug #%s. Do you want to edit
$lang->todo->confirmTask = 'This Todo is linked to Task #%s，Do you want to edit it?';
$lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?';
$lang->todo->statusList['wait'] = 'Wait';
$lang->todo->statusList['wait'] = 'Pending';
$lang->todo->statusList['doing'] = 'Doing';
$lang->todo->statusList['done'] = 'Done';
$lang->todo->statusList['closed'] = 'Closed';
@@ -90,7 +90,7 @@ if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory')
$lang->todo->confirmDelete = "Do you want to delete this Todo?";
$lang->todo->thisIsPrivate = 'This is a private Todo';
$lang->todo->lblDisableDate = 'Set it later';
$lang->todo->lblDisableDate = 'Set later';
$lang->todo->lblBeforeDays = "Create a todo %s day(s) earlier";
$lang->todo->lblClickCreate = "Click to Add Todo";
$lang->todo->noTodo = 'No todos of this type.';
module/user/model.php
-1
View File
@@ -91,7 +91,6 @@ class userModel extends model
$users = $this->dao->select($fields)->from(TABLE_USER)
->where('1')
->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
->andWhere('role')->ne('market')
->orderBy($orderBy)
->fetchAll('account');
if($usersToAppended) $users += $this->dao->select($fields)->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll('account');