From 4d03b12428f83e3cb5c8d1bb1a79a79710b72884 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 21 Feb 2019 10:06:52 +0800 Subject: [PATCH 1/3] * adjust for custom menu. --- module/my/model.php | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index 9b45ca27c5..9d67475eb0 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -22,23 +22,29 @@ class myModel extends model public function setMenu() { /* Adjust the menu order according to the user role. */ - $role = $this->app->user->role; - if($role == 'qa') + $flowModule = $this->config->global->flow . '_my'; + $customMenu = isset($this->config->customMenu->$flowModule) ? $this->config->customMenu->$flowModule : array(); + + if(empty($customMenu)) { - unset($this->lang->my->menuOrder[20]); - $this->lang->my->menuOrder[32] = 'task'; - } - elseif($role == 'po') - { - unset($this->lang->my->menuOrder[35]); - unset($this->lang->my->menuOrder[20]); - $this->lang->my->menuOrder[17] = 'story'; - $this->lang->my->menuOrder[42] = 'task'; - } - elseif($role == 'pm') - { - unset($this->lang->my->menuOrder[40]); - $this->lang->my->menuOrder[17] = 'myProject'; + $role = $this->app->user->role; + if($role == 'qa') + { + unset($this->lang->my->menuOrder[15]); + $this->lang->my->menuOrder[32] = 'task'; + $this->lang->my->dividerMenu = str_replace(',task,', ',' , $this->lang->my->menuOrder[20] . ',', $this->lang->my->dividerMenu); + } + elseif($role == 'po') + { + $this->lang->my->menuOrder[15] = 'story'; + $this->lang->my->menuOrder[30] = 'task'; + $this->lang->my->dividerMenu = str_replace(',task,', ',story,', $this->lang->my->dividerMenu); + } + elseif($role == 'pm') + { + unset($this->lang->my->menuOrder[35]); + $this->lang->my->menuOrder[17] = 'myProject'; + } } } } From f102fd782c4b4e4d239f88855cb15b217841a527 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 21 Feb 2019 10:55:22 +0800 Subject: [PATCH 2/3] * finish task #5281. --- module/search/view/buildform.html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 986d535853..ca07c26eef 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -215,7 +215,7 @@ foreach($fieldParams as $fieldName => $param) echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn'); } echo html::commonButton('', '', 'btn-expand-form btn btn-info pull-right'); - echo html::hidden('formType', 'lite'); + echo html::hidden('formType', zget($formSession, 'formType', 'lite')); ?> @@ -287,8 +287,7 @@ $(function() } } - $searchForm.find('#formType').val(expand ? 'more' : ''); - $searchForm.toggleClass('showmore', expand); + $searchForm.find('#formType').val(expand ? 'more' : 'lite'); }; /** @@ -441,6 +440,7 @@ $(function() $searchForm.find('.btn-save-form').modalTrigger({width:650, type:'iframe', title: setQueryTitle}); + if($('#formType').val() == 'more') expandForm(true); $searchForm.on('click', '.user-query .icon-close', function(e) { var $query = $(this).closest('.user-query'); @@ -457,6 +457,6 @@ $(function() $searchForm.find('.table-condensed input.date').each(function() { setDateField($(this), $(this).attr('id').substr(5)); - }) + }); }); From 91c2085bc0037a97555cb1806a1bd759c9761982 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 21 Feb 2019 13:13:17 +0800 Subject: [PATCH 3/3] * finish task #5298. --- module/doc/lang/en.php | 4 ++++ module/doc/lang/zh-cn.php | 4 ++++ module/doc/view/side.html.php | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 958c171a37..d58fdd6be0 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -187,6 +187,10 @@ $lang->doclib->select = 'Select'; $lang->doclib->project = $lang->projectCommon . ' Library'; $lang->doclib->product = $lang->productCommon . ' Library'; +$lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library'; +$lang->doclib->create['project'] = 'Create ' . $lang->projectCommon . ' Library'; +$lang->doclib->create['custom'] = 'Create Custom Library'; + $lang->doclib->main['product'] = 'Main Library'; $lang->doclib->main['project'] = 'Main Library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 949ddf8663..867064191a 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -187,6 +187,10 @@ $lang->doclib->select = '选择文档库'; $lang->doclib->project = $lang->projectCommon . '库'; $lang->doclib->product = $lang->productCommon . '库'; +$lang->doclib->create['product'] = '创建' . $lang->productCommon . '文档库'; +$lang->doclib->create['project'] = '创建' . $lang->projectCommon . '文档库'; +$lang->doclib->create['custom'] = '创建自定义文档库'; + $lang->doclib->main['product'] = $lang->productCommon . '主库'; $lang->doclib->main['project'] = $lang->projectCommon . '主库'; diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 8d30d0a719..a7722821ff 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -32,6 +32,14 @@ if(empty($type)) $type = 'product';
">
    + +
  • + doclib->create, $tabValue, ''); + if($text) echo html::a($this->createLink($tabValue, 'create'), $text, '', "class='text-ellipsis'"); + ?> +
    • + + + +
  • + doclib->create, $tabValue, ''); + if($text) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe'"); + ?> +
    • + $sideLibName):?> @@ -138,6 +155,7 @@ if(empty($type)) $type = 'product'; +