You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by vd...@apache.org on 2010/02/07 22:04:44 UTC
svn commit: r907491 - in /incubator/esme/trunk/server/src/main:
scala/org/apache/esme/model/User.scala webapp/signup.html
Author: vdichev
Date: Sun Feb 7 21:04:44 2010
New Revision: 907491
URL: http://svn.apache.org/viewvc?rev=907491&view=rev
Log:
ESME-132 Show message on signup page in case of user nickname errors
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
incubator/esme/trunk/server/src/main/webapp/signup.html
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=907491&r1=907490&r2=907491&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Sun Feb 7 21:04:44 2010
@@ -346,7 +346,11 @@
val others = getSingleton.findByNickname(str).
// getSingleton.findAll(By(getSingleton.nickname, str)).
filter(_.id.is != fieldOwner.id.is)
- others.map(u => FieldError(this, <xml:group>Duplicate nickname: {str}</xml:group>))
+ others.map{u =>
+ val msg = "Duplicate nickname: " + str
+ S.error(msg)
+ FieldError(this, Text(msg))
+ }
}
private def validText(str: String): List[FieldError] =
Modified: incubator/esme/trunk/server/src/main/webapp/signup.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/signup.html?rev=907491&r1=907490&r2=907491&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/signup.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/signup.html Sun Feb 7 21:04:44 2010
@@ -38,7 +38,7 @@
<label for="nickname">
<lift:loc>ui_sign_up_nickname</lift:loc>
<br/>
- <signup:nickname/>
+ <signup:nickname/> <lift:msg id="users_nickname"/>
</label>
<br/>
<label for="firstname">