diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 28fbb1ebe8..19713656b4 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -17,6 +17,7 @@ $lang->action->objectID = 'ID'; $lang->action->objectName = 'Name'; $lang->action->actor = 'Operated by'; $lang->action->action = 'Action'; +$lang->action->actionID = 'Action ID'; $lang->action->date = 'Date'; $lang->action->trash = 'Recycle'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 36542db6d8..e6671d8b99 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -17,6 +17,7 @@ $lang->action->objectID = '对象ID'; $lang->action->objectName = '对象名称'; $lang->action->actor = '操作者'; $lang->action->action = '动作'; +$lang->action->actionID = '记录ID'; $lang->action->date = '日期'; $lang->action->trash = '回收站'; diff --git a/module/custom/config.php b/module/custom/config.php index e0da77e4ef..d0b29b2941 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -11,3 +11,5 @@ $config->custom->canAdd['block'] = ''; $config->custom->moblieHidden['main'] = array('repo'); $config->custom->moblieHidden['product'] = array('branch', 'module', 'create'); +$config->custom->moblieHidden['project'] = array('create'); +$config->custom->moblieHidden['my'] = array('effort', 'changePassword', 'manageContacts'); diff --git a/module/project/model.php b/module/project/model.php index 9e3160e51c..969561a0c2 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -122,9 +122,12 @@ class projectModel extends model { if(!$projectID) return; + $isMobile = $this->app->viewType == 'mhtml'; + setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot); $currentProject = $this->getById($projectID); $output = "{$currentProject->name}
"; + if($isMobile) $output = "{$currentProject->name} "; return $output; } diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 36b73a2fcb..b0e4ac7159 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -41,6 +41,7 @@ $lang->testtask->done = "Tested Build"; $lang->testtask->totalStatus = "All"; $lang->testtask->all = "All Product"; +$lang->testtask->id = 'ID'; $lang->testtask->common = 'Test build'; $lang->testtask->product = $lang->productCommon; $lang->testtask->project = $lang->projectCommon; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 0904a72f35..127f9b3947 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -41,6 +41,7 @@ $lang->testtask->done = "已测版本"; $lang->testtask->totalStatus = "全部"; $lang->testtask->all = "全部产品"; +$lang->testtask->id = '编号'; $lang->testtask->common = '测试视图版本'; $lang->testtask->product = '所属' . $lang->productCommon; $lang->testtask->project = '所属' . $lang->projectCommon; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index c254c1c789..35cbd11dc6 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -24,8 +24,11 @@ $lang->todo->import2Today = "Import to Today"; $lang->todo->import = "Import"; $lang->todo->legendBasic = "Basic Info"; +$lang->todo->id = 'ID'; $lang->todo->account = 'Owner'; $lang->todo->date = 'Date'; +$lang->todo->begin = 'Begin'; +$lang->todo->end = 'End'; $lang->todo->beginAB = 'Begin'; $lang->todo->endAB = 'End'; $lang->todo->beginAndEnd = 'Time Frame'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index b478399185..cd5e51b266 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -24,8 +24,11 @@ $lang->todo->import2Today = "导入到今天"; $lang->todo->import = "导入"; $lang->todo->legendBasic = "基本信息"; +$lang->todo->id = '编号'; $lang->todo->account = '所有者'; $lang->todo->date = '日期'; +$lang->todo->begin = '开始'; +$lang->todo->end = '结束'; $lang->todo->beginAB = '开始'; $lang->todo->endAB = '结束'; $lang->todo->beginAndEnd = '起止时间';