* Finish task #43187.

This commit is contained in:
liyuchun
2021-10-14 13:51:47 +08:00
parent ad21350632
commit cfdce3652f
5 changed files with 178 additions and 170 deletions
+2
View File
@@ -333,6 +333,8 @@ $lang->error->equal = "『%s』has to be『%s』.";
$lang->error->int = array("『%s』should be numbers", "『%s』should be 『%s-%s』.");
$lang->error->float = "『%s』should have numbers, or decimals.";
$lang->error->email = "『%s』should be valid Email.";
$lang->error->phone = "『%s』should be valid phone number.";
$lang->error->mobile = "『%s』should be valid mobile number.";
$lang->error->URL = "『%s』should be url.";
$lang->error->date = "『%s』should be valid date.";
$lang->error->datetime = "『%s』should be valid date.";
+2
View File
@@ -333,6 +333,8 @@ $lang->error->equal = "『%s』必须为『%s』。";
$lang->error->int = array("『%s』应当是数字。", "『%s』应当介于『%s-%s』之间。");
$lang->error->float = "『%s』应当是数字,可以是小数。";
$lang->error->email = "『%s』应当为合法的EMAIL。";
$lang->error->phone = "『%s』应当为合法的电话号码。";
$lang->error->mobile = "『%s』应当为合法的手机号码。";
$lang->error->URL = "『%s』应当为合法的URL。";
$lang->error->date = "『%s』应当为合法的日期。";
$lang->error->datetime = "『%s』应当为合法的日期。";
+2
View File
@@ -328,6 +328,8 @@ class stakeholderModel extends model
}
}
if(empty($parents)) return false;
/* Get all parent stakeholders.*/
$parentStakeholders = $this->dao->select('objectID, user')->from(TABLE_STAKEHOLDER)->where('objectID')->in(array_keys($parents))->andWhere('deleted')->eq('0')->fetchAll();
+3 -1
View File
@@ -507,7 +507,9 @@ class userModel extends model
->batchCheck($requiredFields, 'notempty')
->check('account', 'unique', "id != '$userID'")
->check('account', 'account')
->checkIF($this->post->email != '', 'email', 'email')
->checkIF($this->post->email != '', 'email', 'email')
->checkIF($this->post->phone != '', 'phone', 'phone')
->checkIF($this->post->mobile != '', 'mobile', 'mobile')
->where('id')->eq((int)$userID)
->exec();