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

Merge branch 'bugfix_cyy' into 'master'

Browse Source 
Modify app language and API

See merge request easycorp/zentaopms!2488
This commit is contained in:
李玉春
2022-03-24 00:29:54 +00:00
parent 7c8dcef938 b7b3a26e33
commit 6729298c92
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+3
View File
@@ -375,6 +375,9 @@ class router extends baseRouter
$view = json_decode($view);
$view->rand = $this->session->random;
$this->session->set('rand', $this->session->random);
$view->sprintConcept = $this->config->custom->sprintConcept;
$view->URAndSR = $this->config->custom->URAndSR;
echo json_encode($view);
}
module/block/lang/en.php
+18
View File
@@ -550,3 +550,21 @@ $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and
if($config->systemMode == 'new') $lang->block->flowchart['project'] = array('Project Manager', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
$lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Design', 'Update Status', 'Finish Tasks/Bugs', 'Commit Code');
$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
$lang->block->zentaoapp = new stdclass();
$lang->block->zentaoapp->thisYearInvestment = 'Investment The Year';
$lang->block->zentaoapp->sinceTotalInvestment = 'Total Investment';
$lang->block->zentaoapp->myStory = 'My Story';
$lang->block->zentaoapp->allStorySum = 'Total Stories';
$lang->block->zentaoapp->storyCompleteRate = 'Story CompleteRate';
$lang->block->zentaoapp->latestExecution = 'Latest Execution';
$lang->block->zentaoapp->involvedExecution = 'Involved Execution';
$lang->block->zentaoapp->mangedProduct = 'Manged Product';
$lang->block->zentaoapp->involvedProject = 'Involved Project';
$lang->block->zentaoapp->customIndexCard = 'Custom Index Cards';
$lang->block->zentaoapp->createStory = 'Story Create';
$lang->block->zentaoapp->createEffort = 'Effort Create';
$lang->block->zentaoapp->createDoc = 'Doc Create';
$lang->block->zentaoapp->createTodo = 'Todo Create';
$lang->block->zentaoapp->workbench = 'Workbench';
$lang->block->zentaoapp->notSupportKanban = 'The mobile terminal does not support the R&D Kanban mode';
module/block/lang/zh-cn.php
+1
View File
@@ -586,3 +586,4 @@ $lang->block->zentaoapp->createEffort = '记日志';
$lang->block->zentaoapp->createDoc = '建文档';
$lang->block->zentaoapp->createTodo = '建待办';
$lang->block->zentaoapp->workbench = '工作台';
$lang->block->zentaoapp->notSupportKanban = '移动端暂不支持研发看板模式';
module/execution/control.php
+5 -1
View File
@@ -1980,7 +1980,11 @@ class execution extends control
$type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban';
if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));
if($execution->type == 'kanban') return $this->locate(inlink('kanban', "executionID=$executionID"));
if($execution->type == 'kanban')
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return print($this->fetch('execution', 'kanban', "executionID=$executionID"));
return $this->locate(inlink('kanban', "executionID=$executionID"));
}
$this->app->loadLang('program');