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

* Finish task #8597.

Browse Source
This commit is contained in:
Yagami
2020-12-10 15:05:33 +08:00
parent 3ecbf0262b
commit 81302ef084
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menuOrder.php
+5
View File
@@ -145,6 +145,11 @@ $lang->system->menuOrder[5] = 'company';
$lang->system->menuOrder[10] = 'scrum';
$lang->system->menuOrder[15] = 'waterfall';
/* system menu order. */
$lang->subject->menuOrder[5] = 'subject';
$lang->subject->menuOrder[10] = 'holiday';
$lang->subject->menuOrder[15] = 'concept';
/* admin menu order. */
$lang->admin->menuOrder[5] = 'index';
$lang->admin->menuOrder[9] = 'company';
module/common/lang/zh-cn.php
+2 -2
View File
@@ -204,7 +204,7 @@ $lang->holiday->menu = $lang->subject->menu;
$lang->stage = new stdclass();
$lang->stage->menu = new stdclass();
$lang->stage->menu->estimate = array('link' => '估算|custom|estimate');
$lang->stage->menu->stage = array('link' => '阶段|stage|settype', 'alias' => 'browse,create,edit,batchcreate');
$lang->stage->menu->stage = array('link' => '阶段|stage|settype', 'subModule' => 'stage');
$lang->measurement = new stdclass();
$lang->measurement->menu = new stdclass();
@@ -950,6 +950,6 @@ $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|produc
$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}");
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'auditcl', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/group/lang/resource.php
+1 -1
View File
@@ -1156,7 +1156,7 @@ $lang->resource->custom->working = 'working';
$lang->resource->custom->setPublic = 'setPublic';
$lang->resource->custom->timezone = 'timezone';
$lang->resource->custom->estimate = 'estimate';
$lang->resource->custom->setStoryContcept = 'setStoryContcept';
$lang->resource->custom->setStoryConcept = 'setStoryConcept';
$lang->resource->custom->configureScrum = 'configureScrum';
$lang->custom->methodOrder[5] = 'index';
module/holiday/control.php
+4
View File
@@ -31,6 +31,10 @@ class holiday extends control
*/
public function browse($year = '')
{
$this->lang->menugroup->holiday = '';
$this->lang->holiday->menu = $this->lang->subject->menu;
$this->lang->holiday->menuOrder = $this->lang->subject->menuOrder;
$holidays = $this->holiday->getList($year);
$yearList = $this->holiday->getYearPairs();