diff --git a/module/action/control.php b/module/action/control.php index 2355ae678d..e21987216a 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -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); diff --git a/module/common/model.php b/module/common/model.php index 3bffa73350..e883a309e3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -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); } diff --git a/module/custom/control.php b/module/custom/control.php index f0b13b6818..b7792f4b73 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -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')