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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2022-03-02 11:05:55 +08:00
parent 0aa901eb64 b33cb32e4b
commit 4e9409ed76
6 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/group/ext/lang/resource.php
+33 -32
View File
@@ -52,7 +52,7 @@ $lang->resource->my->work = 'workAction';
$lang->resource->my->contribute = 'contributeAction';
$lang->resource->my->profile = 'profileAction';
$lang->resource->my->uploadAvatar = 'uploadAvatar';
$lang->resource->my->preference = 'preference';
//$lang->resource->my->preference = 'preference';
$lang->resource->my->dynamic = 'dynamicAction';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->my->changePassword = 'changePassword';
@@ -63,10 +63,10 @@ $lang->resource->my->team = 'team';
$lang->resource->my->requirement = 'requirement';
$lang->resource->my->story = 'story';
$lang->resource->my->task = 'task';
$lang->resource->my->bug = 'bug';
//$lang->resource->my->bug = 'bug';
$lang->resource->my->doc = 'doc';
$lang->resource->my->testtask = 'testtask';
$lang->resource->my->testcase = 'testcase';
//$lang->resource->my->testtask = 'testtask';
//$lang->resource->my->testcase = 'testcase';
$lang->resource->my->execution = 'execution';
$lang->my->methodOrder[1] = 'index';
@@ -137,7 +137,7 @@ if($config->systemMode == 'new')
$lang->resource->project->index = 'index';
$lang->resource->project->browse = 'browse';
$lang->resource->project->kanban = 'kanban';
$lang->resource->project->programTitle = 'moduleOpen';
// $lang->resource->project->programTitle = 'moduleOpen';
$lang->resource->project->create = 'create';
$lang->resource->project->edit = 'edit';
$lang->resource->project->batchEdit = 'batchEdit';
@@ -157,13 +157,13 @@ if($config->systemMode == 'new')
$lang->resource->project->whitelist = 'whitelist';
$lang->resource->project->addWhitelist = 'addWhitelist';
$lang->resource->project->unbindWhitelist = 'unbindWhitelist';
$lang->resource->project->manageProducts = 'manageProducts';
// $lang->resource->project->manageProducts = 'manageProducts';
$lang->resource->project->dynamic = 'dynamic';
$lang->resource->project->qa = 'qa';
$lang->resource->project->bug = 'bug';
$lang->resource->project->testcase = 'testcase';
$lang->resource->project->testtask = 'testtask';
$lang->resource->project->testreport = 'testreport';
// $lang->resource->project->qa = 'qa';
// $lang->resource->project->bug = 'bug';
// $lang->resource->project->testcase = 'testcase';
// $lang->resource->project->testtask = 'testtask';
// $lang->resource->project->testreport = 'testreport';
$lang->resource->project->execution = 'execution';
$lang->resource->project->export = 'export';
$lang->resource->project->createGuide = 'createGuide';
@@ -213,12 +213,12 @@ if($config->systemMode == 'new')
/* Project Story. */
$lang->resource->projectstory = new stdclass();
$lang->resource->projectstory->story = 'story';
$lang->resource->projectstory->track = 'trackAction';
// $lang->resource->projectstory->track = 'trackAction';
$lang->resource->projectstory->view = 'view';
$lang->resource->projectstory->linkStory = 'linkStory';
$lang->resource->projectstory->unlinkStory = 'unlinkStory';
$lang->resource->projectstory->batchUnlinkStory = 'batchUnlinkStory';
$lang->resource->projectstory->importplanstories = 'importplanstories';
// $lang->resource->projectstory->importplanstories = 'importplanstories';
$lang->projectstory->methodOrder[5] = 'story';
$lang->projectstory->methodOrder[10] = 'track';
@@ -247,9 +247,9 @@ $lang->resource->story->close = 'closeAction';
$lang->resource->story->batchClose = 'batchClose';
$lang->resource->story->activate = 'activateAction';
$lang->resource->story->tasks = 'tasks';
$lang->resource->story->bugs = 'bugs';
$lang->resource->story->cases = 'cases';
$lang->resource->story->zeroCase = 'zeroCase';
//$lang->resource->story->bugs = 'bugs';
//$lang->resource->story->cases = 'cases';
//$lang->resource->story->zeroCase = 'zeroCase';
$lang->resource->story->report = 'reportAction';
$lang->resource->story->batchChangePlan = 'batchChangePlan';
$lang->resource->story->batchChangeBranch = 'batchChangeBranch';
@@ -257,7 +257,7 @@ $lang->resource->story->batchChangeStage = 'batchChangeStage';
$lang->resource->story->batchAssignTo = 'batchAssignTo';
$lang->resource->story->batchChangeModule = 'batchChangeModule';
$lang->resource->story->batchToTask = 'batchToTask';
$lang->resource->story->track = 'trackAB';
//$lang->resource->story->track = 'trackAB';
$lang->resource->story->processStoryChange = 'processStoryChange';
$lang->story->methodOrder[5] = 'create';
@@ -335,6 +335,7 @@ $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn';
$lang->resource->kanban->viewArchivedCard = 'viewArchivedCard';
$lang->resource->kanban->restoreCard = 'restoreCard';
$lang->resource->kanban->setLaneHeight = 'setLaneHeight';
$lang->resource->kanban->batchCreateCard = 'batchCreateCard';
$lang->kanban->methodOrder[5] = 'space';
$lang->kanban->methodOrder[10] = 'createSpace';
@@ -397,23 +398,23 @@ $lang->resource->execution->delete = 'deleteAB';
$lang->resource->execution->task = 'task';
$lang->resource->execution->grouptask = 'groupTask';
$lang->resource->execution->importtask = 'importTask';
$lang->resource->execution->importplanstories = 'importPlanStories';
$lang->resource->execution->importBug = 'importBug';
//$lang->resource->execution->importplanstories = 'importPlanStories';
//$lang->resource->execution->importBug = 'importBug';
$lang->resource->execution->story = 'story';
$lang->resource->execution->build = 'build';
//$lang->resource->execution->build = 'build';
//$lang->resource->execution->qa = 'qa';
$lang->resource->execution->testtask = 'testtask';
$lang->resource->execution->testcase = 'testcase';
$lang->resource->execution->bug = 'bug';
$lang->resource->execution->testreport = 'testreport';
$lang->resource->execution->burn = 'burn';
$lang->resource->execution->computeBurn = 'computeBurnAction';
$lang->resource->execution->fixFirst = 'fixFirst';
$lang->resource->execution->burnData = 'burnData';
//$lang->resource->execution->testtask = 'testtask';
//$lang->resource->execution->testcase = 'testcase';
//$lang->resource->execution->bug = 'bug';
//$lang->resource->execution->testreport = 'testreport';
//$lang->resource->execution->burn = 'burn';
//$lang->resource->execution->computeBurn = 'computeBurnAction';
//$lang->resource->execution->fixFirst = 'fixFirst';
//$lang->resource->execution->burnData = 'burnData';
$lang->resource->execution->team = 'teamAction';
$lang->resource->execution->doc = 'doc';
$lang->resource->execution->dynamic = 'dynamic';
$lang->resource->execution->manageProducts = 'manageProducts';
//$lang->resource->execution->manageProducts = 'manageProducts';
//$lang->resource->execution->manageChilds = 'manageChilds';
$lang->resource->execution->manageMembers = 'manageMembers';
$lang->resource->execution->unlinkMember = 'unlinkMember';
@@ -422,7 +423,7 @@ $lang->resource->execution->unlinkStory = 'unlinkStory';
$lang->resource->execution->batchUnlinkStory = 'batchUnlinkStory';
$lang->resource->execution->updateOrder = 'updateOrder';
$lang->resource->execution->taskKanban = 'taskKanban';
$lang->resource->execution->printKanban = 'printKanbanAction';
//$lang->resource->execution->printKanban = 'printKanbanAction';
$lang->resource->execution->tree = 'treeAction';
$lang->resource->execution->treeTask = 'treeOnlyTask';
$lang->resource->execution->treeStory = 'treeOnlyStory';
@@ -435,7 +436,7 @@ $lang->resource->execution->storySort = 'storySort';
$lang->resource->execution->whitelist = 'whitelist';
$lang->resource->execution->addWhitelist = 'addWhitelist';
$lang->resource->execution->unbindWhitelist = 'unbindWhitelist';
$lang->resource->execution->storyEstimate = 'storyEstimate';
//$lang->resource->execution->storyEstimate = 'storyEstimate';
$lang->resource->execution->executionkanban = 'kanbanAction';
$lang->resource->execution->kanban = 'RDKanban';
//if($config->systemMode == 'classic') $lang->resource->project->list = 'list';
@@ -708,7 +709,7 @@ $lang->resource->user->delete = 'delete';
$lang->resource->user->todo = 'todo';
$lang->resource->user->story = 'story';
$lang->resource->user->task = 'task';
$lang->resource->user->bug = 'bug';
//$lang->resource->user->bug = 'bug';
$lang->resource->user->testTask = 'testTask';
$lang->resource->user->testCase = 'testCase';
$lang->resource->user->execution = 'execution';
extension/lite/message/ext/lang/en/lite.php
+2
View File
@@ -1,3 +1,5 @@
<?php
$lang->message->label->archived = 'Archive';
$lang->message->label->deleted = 'Delete';
unset($lang->message->typeList['xuanxuan']);
extension/lite/message/ext/lang/zh-cn/lite.php
+2
View File
@@ -1,3 +1,5 @@
<?php
$lang->message->label->archived = '归档';
$lang->message->label->deleted = '删除';
unset($lang->message->typeList['xuanxuan']);
extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
+1 -1
View File
@@ -1,4 +1,4 @@
<?php $html = '<div class="divider"></div>';?>
<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
<script>
$(function()
{
module/common/model.php
+3
View File
@@ -479,6 +479,9 @@ class commonModel extends model
{
$currentVision = $app->config->vision;
$userVisions = array_filter(explode(',', $app->user->visions));
if($app->config->systemMode != 'new') return print("<div>{$lang->visionList['rnd']}</div>");
if(count($userVisions) < 2) return print("<div>{$lang->visionList[$currentVision]}</div>");
echo "<ul class='dropdown-menu pull-right'>";
module/user/model.php
+3
View File
@@ -2683,6 +2683,9 @@ class userModel extends model
public function getVisionList()
{
$visionList = $this->lang->visionList;
if($this->config->systemMode != 'new') unset($visionList['lite']);
foreach($visionList as $visionKey => $visionName)
{
if(strpos($this->config->visions, ",{$visionKey},") === false) unset($visionList[$visionKey]);