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:
hufangzhou
2020-11-24 09:08:26 +08:00
parent 6d25f07fa8 40630c75a8
commit ef684a132a
3 changed files with 2 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/zh-cn.php
+1 -1
View File
@@ -271,7 +271,7 @@ $lang->block->default['full']['my']['5']['block'] = 'contribute';
$lang->block->default['full']['my']['5']['source'] = '';
$lang->block->default['full']['my']['5']['grid'] = 4;
$lang->block->default['full']['my']['6']['title'] = '我的近期项目';
$lang->block->default['full']['my']['6']['title'] = '我近期参与的项目';
$lang->block->default['full']['my']['6']['block'] = 'recentproject';
$lang->block->default['full']['my']['6']['source'] = 'project';
$lang->block->default['full']['my']['6']['grid'] = 8;
module/block/view/recentprojectblock.html.php
+1 -2
View File
@@ -37,8 +37,7 @@
<div class='col' data-id='<?php echo $projectID?>'>
<div class='panel' data-url='<?php echo $this->createLink('project', 'index', "projectID=$project->id");?>'>
<div class='panel-heading'>
<?php $parentName = $project->parentName ? $project->parentName . '/' : '';?>
<strong class='project-name' title='<?php echo $parentName . $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $parentName . $project->name);?> </strong>
<strong class='project-name' title='<?php echo $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> </strong>
<?php if($project->model === 'waterfall'): ?>
<span class='project-type-label label label-warning label-outline'><?php echo $lang->program->waterfall; ?></span>
<?php else: ?>
module/group/lang/resource.php
-97
View File
@@ -1820,100 +1820,3 @@ $lang->changelog['12.3'][] = 'ci-commitResult';
$lang->changelog['12.5'][] = 'story-batchToTask';
$lang->changelog['12.5'][] = 'custom-product';
$lang->changelog['12.5'][] = 'custom-project';
global $config;
if($config->global->flow != 'full')
{
unset($lang->moduleOrder[10]);
unset($lang->resource->qa);
unset($lang->moduleOrder[50]);
unset($lang->resource->report);
unset($lang->moduleOrder[90]);
}
if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTask')
{
unset($lang->resource->build);
unset($lang->moduleOrder[45]);
unset($lang->resource->bug);
unset($lang->moduleOrder[55]);
unset($lang->resource->testcase);
unset($lang->moduleOrder[60]);
unset($lang->resource->testtask);
unset($lang->moduleOrder[65]);
unset($lang->resource->my->bug);
unset($lang->resource->my->testTask);
unset($lang->resource->my->testCase);
}
if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTest')
{
unset($lang->resource->project);
unset($lang->moduleOrder[35]);
unset($lang->resource->task);
unset($lang->moduleOrder[40]);
unset($lang->resource->my->task);
unset($lang->resource->my->project);
unset($lang->resource->product->project);
}
if($config->global->flow == 'onlyTask' || $config->global->flow == 'onlyTest')
{
unset($lang->resource->story);
unset($lang->moduleOrder[20]);
unset($lang->resource->productplan);
unset($lang->moduleOrder[25]);
unset($lang->resource->release);
unset($lang->moduleOrder[30]);
unset($lang->resource->my->story);
}
if($config->global->flow == 'onlyStory')
{
unset($lang->resource->svn);
unset($lang->moduleOrder[150]);
unset($lang->resource->git);
unset($lang->moduleOrder[155]);
unset($lang->resource->story->tasks);
}
if($config->global->flow == 'onlyTask')
{
unset($lang->resource->product);
unset($lang->moduleOrder[15]);
unset($lang->resource->bug);
unset($lang->moduleOrder[55]);
unset($lang->resource->project->importbug);
unset($lang->resource->project->story);
unset($lang->resource->project->bug);
unset($lang->resource->project->linkStory);
unset($lang->resource->project->unlinkStory);
unset($lang->resource->project->ajaxGetProducts);
}
if($config->global->flow == 'onlyTest')
{
unset($lang->resource->product->browse);
unset($lang->resource->product->roadmap);
unset($lang->resource->product->dynamic);
unset($lang->resource->product->ajaxGetProjects);
unset($lang->resource->product->ajaxGetPlans);
unset($lang->resource->build->ajaxGetProjectBuilds);
unset($lang->build->methodOrder[30]);
unset($lang->resource->bug->confirmStoryChange);
unset($lang->bug->methodOrder[60]);
unset($lang->resource->testcase->confirmStoryChange);
unset($lang->testcase->methodOrder[40]);
$lang->resource->product->build = 'build';
$lang->product->methodOrder[5] = 'build';
}