forks/baikal
1
0
Fork 0
Code Releases Activity

Username may now be an email address.

Browse source
This commit is contained in:
Jérôme Schneider 2012-11-19 14:01:14 +01:00
parent b586d01710
commit 789203a3e3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Frameworks/Baikal/Model/User.php
View file

@ -204,7 +204,7 @@ class User extends \Flake\Core\Model\Db {
$oMorpho->add(new \Formal\Element\Text(array(
"prop" => "username",
"label" => "Username",
"validation" => "required,tokenid,unique",
"validation" => "required,unique",
"popover" => array(
"title" => "Username",
"content" => "The login for this user account.<br />It has to be unique.",
@ -239,7 +239,7 @@ class User extends \Flake\Core\Model\Db {
)));
if($this->floating()) {
$oMorpho->element("username")->setOption("help", "Allowed characters are digits, lowercase letters and the dash symbol '-'.");
$oMorpho->element("username")->setOption("help", "May be an email, but not forcibly.");
$oMorpho->element("password")->setOption("validation", "required");
} else {
$sNotice = "-- Leave empty to keep current password --";