Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239

Browse Source
This commit is contained in:
Yagami
2022-10-21 10:17:11 +08:00
parent b8f19c5db6 c9e777c7c3
commit 28217aff99
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/personnel/control.php
+4 -4
View File
@@ -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')
module/project/model.php
+1 -1
View File
@@ -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();
}
/**
module/user/control.php
+1
View File
@@ -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" : '';