diff --git a/extension/lite/custom/ext/lang/de/lite.php b/extension/lite/custom/ext/lang/de/lite.php index 7b4a6e67f3..f3ee432ea4 100644 --- a/extension/lite/custom/ext/lang/de/lite.php +++ b/extension/lite/custom/ext/lang/de/lite.php @@ -22,6 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); +$lang->custom->task->fields['required'] = 'Required Field'; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php index 7b4a6e67f3..f3ee432ea4 100644 --- a/extension/lite/custom/ext/lang/en/lite.php +++ b/extension/lite/custom/ext/lang/en/lite.php @@ -22,6 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); +$lang->custom->task->fields['required'] = 'Required Field'; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/fr/lite.php b/extension/lite/custom/ext/lang/fr/lite.php index 7b4a6e67f3..f3ee432ea4 100644 --- a/extension/lite/custom/ext/lang/fr/lite.php +++ b/extension/lite/custom/ext/lang/fr/lite.php @@ -22,6 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); +$lang->custom->task->fields['required'] = 'Required Field'; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php index 4380e13b6e..fc184d77d3 100644 --- a/extension/lite/custom/ext/lang/zh-cn/lite.php +++ b/extension/lite/custom/ext/lang/zh-cn/lite.php @@ -22,6 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); +$lang->custom->task->fields['required'] = '必填项'; $lang->custom->task->fields['priList'] = '优先级'; $lang->custom->task->fields['typeList'] = '类型'; diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 14a3592588..f5a9dbd9b8 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -88,12 +88,12 @@ $lang->admin->menuList->feature['subMenu']['product'] = array('link' => "{$l $lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|"); $lang->admin->menuList->feature['subMenu']['qa'] = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required'); $lang->admin->menuList->feature['subMenu']['kanban'] = array('link' => "{$lang->kanban->common}|custom|kanban|"); -$lang->admin->menuList->feature['subMenu']['doc'] = array('link' => "{$lang->doc->common}|custom|required|module=doc"); +$lang->admin->menuList->feature['subMenu']['doc'] = array('link' => "{$lang->doc->common}|custom|required|module=doc", 'exclude' => 'required'); $lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|set|module=user", 'exclude' => 'set,required'); $lang->admin->menuList->feature['tabMenu']['my']['todo'] = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList"); $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed"); -if($this->config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array(); +if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task"); $lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|')); diff --git a/module/admin/model.php b/module/admin/model.php index 5cae3daad8..88463b0d7b 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -277,6 +277,7 @@ class adminModel extends model if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false) { if(strpos(',todo,block,', $paramName) !== false) $subMenuKey = 'my'; + if($this->config->vision == 'lite' and $paramName == 'task') $subMenuKey = 'my'; if(isset($subMenuKey)) $this->lang->admin->menuList->$menuKey['subMenu'][$subMenuKey]['subModule'] = $moduleName; } diff --git a/module/admin/view/tabmenu.html.php b/module/admin/view/tabmenu.html.php index 7cac472935..cc3ed238af 100755 --- a/module/admin/view/tabmenu.html.php +++ b/module/admin/view/tabmenu.html.php @@ -11,8 +11,8 @@ $name = $lang->custom->object[$tabMenuKey]; $paramName = $this->app->rawParams ? reset($this->app->rawParams) : ''; - $active = ($tabMethod == $tabMenuKey and strpos(',required,set,', ",$tabMethod",) === false) ? 'btn-active-text' : ''; - $active = ($paramName == $tabMenuKey and strpos(',required,set,', ",$tabMethod",)) ? 'btn-active-text' : $active; + $active = ($tabMethod == $tabMenuKey and strpos(',required,set,', ",$tabMethod,",) === false) ? 'btn-active-text' : ''; + $active = ($paramName == $tabMenuKey and strpos(',required,set,', ",$tabMethod,",) !== false) ? 'btn-active-text' : $active; common::printLink($tabModule, $tabMethod, $tabParams, "{$name}", '', "class='btn btn-link {$active}' id='{$tabMenuKey}Tab'"); } ?> diff --git a/module/custom/js/set.js b/module/custom/js/set.js index e6540cd08e..c859aec690 100644 --- a/module/custom/js/set.js +++ b/module/custom/js/set.js @@ -8,12 +8,6 @@ function delItem(clickedButton) $(clickedButton).parent().parent().remove(); } -$(function() -{ - $('#' + module + 'Tab').addClass('btn-active-text'); - $('#' + field + 'Tab').addClass('active'); -}) - $('[name*=unitList]').change(function() { var defaultCurrency = $('#defaultCurrency').val(); diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 85932e81f2..be44c97b4e 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -11,24 +11,17 @@ */ ?> -