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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-06-11 15:34:38 +08:00
parent 48353b2897 e42385a1c3
commit 1f9f3a9d17
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
+1
View File
@@ -44,6 +44,7 @@ class action extends control
$this->session->set('opportunityList', $uri, 'project');
$this->session->set('riskList', $uri, 'project');
$this->session->set('trainplanList', $uri, 'project');
$this->session->set('roomList', $uri, 'admin');
/* Get deleted objects. */
$this->app->loadClass('pager', $static = true);
module/common/model.php
+1 -1
View File
@@ -1412,7 +1412,7 @@ EOD;
$diff = '';
if(substr_count($value, "\n") > 1 or
substr_count($old->$key, "\n") > 1 or
strpos('name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution', strtolower($key)) !== false)
strpos('name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution,outline,schedule', strtolower($key)) !== false)
{
$diff = commonModel::diff($old->$key, $value);
}
module/custom/control.php
+1 -1
View File
@@ -159,7 +159,7 @@ class custom extends control
{
if(!is_numeric($key) or $key > 255) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidNumberKey));
}
if(!empty($key) and !isset($oldCustoms[$key]) and $key != 'n/a' and !validater::checkREG($key, '/^[a-z_0-9]+$/')) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidStringKey));
if(!empty($key) and !isset($oldCustoms[$key]) and $key != 'n/a' and !validater::checkREG($key, '/^[a-z_A-Z_0-9]+$/')) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidStringKey));
/* The length of roleList in user module and typeList in todo module is less than 10. check it when saved. */
if($field == 'roleList' or $module == 'todo' and $field == 'typeList')