From 5819bb69b80514cabf5b8440a25d7fc0eab5ea77 Mon Sep 17 00:00:00 2001 From: chenfei Date: Sat, 18 Jul 2020 20:08:18 +0800 Subject: [PATCH] * Finish task for dayup: http://vision.5upm.com/task-view-408.html --- module/tree/control.php | 15 ++++++++++++--- module/tree/view/browse.html.php | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/module/tree/control.php b/module/tree/control.php index fa76911d65..3a7a16d428 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -164,9 +164,18 @@ class tree extends control $position[] = $this->lang->tree->manageTrainskill; } elseif($viewType == 'trainpost') - { - $this->lang->set('menugroup.tree', 'train'); - $this->lang->tree->menu = $this->lang->train->menu; + { + $postBrowseType = $this->session->postBrowseType ? $this->session->postBrowseType : 'train'; + if($postBrowseType == 'train') + { + $this->lang->set('menugroup.tree', 'train'); + $this->lang->tree->menu = $this->lang->train->menu; + } + else + { + $this->lang->set('menugroup.tree', 'company'); + $this->lang->tree->menu = $this->lang->company->menu; + } $title = $this->lang->tree->manageTrainpost; $position[] = $this->lang->tree->manageTrainpost; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 56ef2bf98d..907a415c30 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -20,7 +20,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;} app->loadLang('doc');?> type) && $root->type != 'normal')) ? true : false;?> -tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?> +tree->line : (($viewType == 'doc' or $viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') ? $lang->tree->cate : $lang->tree->name);?> doc->childType : $lang->tree->child);?>