diff --git a/module/issue/control.php b/module/issue/control.php index 93b159f048..a36ab70836 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -25,15 +25,17 @@ class issue extends control */ public function browse($browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $browseType = strtolower($browseType); + $uri = $this->app->getURI(true); + $this->session->set('issueList', $uri); /* Load pager */ $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); /* Build the search form. */ - $queryID = ($browseType == 'bysearch') ? (int)$param : 0; - $actionURL = $this->createLink('issue', 'browse', "browseType=bysearch&queryID=myQueryID"); + $browseType = strtolower($browseType); + $queryID = ($browseType == 'bysearch') ? (int)$param : 0; + $actionURL = $this->createLink('issue', 'browse', "browseType=bysearch&queryID=myQueryID"); $this->issue->buildSearchForm($actionURL, $queryID); $this->view->title = $this->lang->issue->common . $this->lang->colon . $this->lang->issue->browse; diff --git a/module/issue/view/view.html.php b/module/issue/view/view.html.php index ce46d23f8a..950794ae01 100644 --- a/module/issue/view/view.html.php +++ b/module/issue/view/view.html.php @@ -13,7 +13,7 @@ createLink('issue', 'browse'); +$browseLink = $app->session->issueList != false ? $app->session->issueList : $this->createLink('issue', 'browse'); $createLink = $this->createLink('issue', 'create'); $dateFiled = array('deadline', 'resolvedDate', 'createdDate', 'editedDate', 'activateDate', 'closedDate', 'assignedDate'); diff --git a/module/my/view/team.html.php b/module/my/view/team.html.php index ffc690c23b..1b7ff4405e 100644 --- a/module/my/view/team.html.php +++ b/module/my/view/team.html.php @@ -43,7 +43,7 @@ include '../../common/view/header.html.php'; email);?> user->genderList, $user->gender, $user->gender);?> phone;?> - config->isINT) ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq", $user->qq) : '');?> + config->isINT) ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq#open=my", $user->qq) : '');?> last) echo date('Y-m-d', $user->last);?> visits;?> diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 930c61f5e3..5e86440a0a 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -16,7 +16,8 @@
name . $lang->project->statge . '(' . $programPlan->begin . $lang->project->to . $programPlan->end . ')'; + $title = $lang->programplan->create; + if($planID) $title = $programPlan->name . $lang->project->statge . '(' . $programPlan->begin . $lang->project->to . $programPlan->end . ')'; echo "{$title}"; ?> diff --git a/module/user/control.php b/module/user/control.php index 2bdbe2d02b..156e1ff78f 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -368,6 +368,9 @@ class user extends control */ public function execution($userID, $fromModule = 'user', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $uri = $this->app->getURI(true); + $this->session->set('projectList', $uri); + $user = $this->user->getById($userID, 'id'); $account = $user->account; $users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid'); @@ -410,6 +413,9 @@ class user extends control */ public function issue($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $uri = $this->app->getURI(true); + $this->session->set('issueList', $uri); + $user = $this->user->getById($userID, 'id'); $account = $user->account; $users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid'); @@ -453,6 +459,9 @@ class user extends control */ public function risk($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $uri = $this->app->getURI(true); + $this->session->set('riskList', $uri); + $user = $this->user->getById($userID, 'id'); $account = $user->account; $users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid'); diff --git a/module/user/lang/de.php b/module/user/lang/de.php index d4ed6d90d7..cec81ee54e 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = 'Stage'; +$lang->user->executionTypeList['sprint'] = 'Iteration'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Kontakt'; $lang->user->contacts->listName = 'Namensliste'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ff429d7dbf..44f096a923 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = 'Stage'; +$lang->user->executionTypeList['sprint'] = 'Iteration'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contacts'; $lang->user->contacts->listName = 'List Name'; diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index bf3f1c017a..4088a4bff5 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = 'Stage'; +$lang->user->executionTypeList['sprint'] = 'Iteration'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contacts'; $lang->user->contacts->listName = 'Nom de la Liste'; diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php index 6835d14984..0dbd4d62ae 100644 --- a/module/user/lang/vi.php +++ b/module/user/lang/vi.php @@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = 'Stage'; +$lang->user->executionTypeList['sprint'] = 'Iteration'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Liên lạc'; $lang->user->contacts->listName = 'Tên danh sách'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index a7f75ede3a..ec5e21b815 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = '阶段'; +$lang->user->executionTypeList['sprint'] = '迭代'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = '联系人'; $lang->user->contacts->listName = '列表名称'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 1516429901..aae959a154 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -198,6 +198,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype; $lang->user->contactFieldList['slack'] = $lang->user->slack; $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->executionTypeList['stage'] = '階段'; +$lang->user->executionTypeList['sprint'] = '迭代'; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = '聯繫人'; $lang->user->contacts->listName = '列表名稱'; diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php index fc2016a1ab..47a47c5dcd 100644 --- a/module/user/view/execution.html.php +++ b/module/user/view/execution.html.php @@ -30,11 +30,11 @@ - createLink('project', 'view', "projectID=$execution->id");?> + createLink('project', 'view', "projectID=$execution->id", '', false, $execution->project);?> id);?> - project->typeList, $execution->type);?> + user->executionTypeList, $execution->type);?> name);?> begin;?>