diff --git a/module/personnel/control.php b/module/personnel/control.php index 5046609e2a..b201188e71 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -176,10 +176,10 @@ class personnel extends control $copyUsers = empty($copyID) ? array() : $this->personnel->getWhitelistAccount($copyID, $copyObjectType); $appendUsers = array_unique($deptUsers + $copyUsers); - $objectName = $this->lang->projectCommon . $this->lang->execution->or . $objectName; - if($objectType == 'program') $objectName = $this->lang->program->common; - if($objectType == 'product') $objectName = $this->lang->productCommon; - if($objectType == 'project') $objectName = $this->lang->projectCommon; + $objectName = $this->lang->projectCommon . $this->lang->execution->or . $this->lang->execution->common;; + if($objectType == 'program') $objectName = $this->lang->program->common; + if($objectType == 'product') $objectName = $this->lang->productCommon; + if($objectType == 'project') $objectName = $this->lang->projectCommon; $this->lang->personnel->selectObjectTips = sprintf($this->lang->personnel->selectObjectTips, $objectName); if($objectType == 'sprint' and $module == 'execution') diff --git a/module/project/model.php b/module/project/model.php index af615515ae..2fe088fcb3 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -931,7 +931,7 @@ class projectModel extends model */ public function getProjectExecutionPairs() { - return $this->dao->select('project, id')->from(TABLE_PROJECT)->andWhere('multiple')->eq('0')->andWhere('deleted')->eq('0')->fetchPairs(); + return $this->dao->select('project, id')->from(TABLE_PROJECT)->where('multiple')->eq('0')->andWhere('deleted')->eq('0')->fetchPairs(); } /** diff --git a/module/user/control.php b/module/user/control.php index 75a0f5f18b..2936b62c09 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -1043,6 +1043,7 @@ class user extends control session_destroy(); setcookie('za', false); setcookie('zp', false); + setcookie('tab', false); if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success'))); $vars = !empty($referer) ? "referer=$referer" : '';