You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/05/19 15:19:40 UTC
svn commit: r776304 - in /labs/magma/trunk:
fragment-user-domain/src/main/java/org/apache/magma/domain/user/
fragment-user-web/src/main/java/org/apache/magma/web/user/
fragment-user-web/src/main/resources/org/apache/magma/web/user/
Author: simoneg
Date: Tue May 19 13:19:40 2009
New Revision: 776304
URL: http://svn.apache.org/viewvc?rev=776304&view=rev
Log:
Minor fixes
Added:
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activated.vm
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/registered.vm
Removed:
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/thanks.vm
Modified:
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserCrud.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activation.vm
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/loginerror.vm
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/notactive.vm
labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/settings.vm
Modified: labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java (original)
+++ labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java Tue May 19 13:19:40 2009
@@ -28,7 +28,7 @@
private String email;
private String password;
private String confirmPassword;
- private boolean activate;
+ private boolean active;
private boolean admin;
@Id
@@ -76,7 +76,7 @@
this.email = email;
}
- @View
+ @View(password=true)
@Order(4)
@Required
@Length(min=4)
@@ -87,7 +87,7 @@
this.password = password;
}
- @View
+ @View(password=true)
@Transient
@Order(5)
@Required
@@ -102,11 +102,11 @@
@View
@Order(6)
- public boolean isActivate() {
- return activate;
+ public boolean isActive() {
+ return active;
}
- public void setActivate(boolean activate) {
- this.activate = activate;
+ public void setActive(boolean active) {
+ this.active = active;
}
@View
@Order(7)
Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj (original)
+++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj Tue May 19 13:19:40 2009
@@ -10,7 +10,7 @@
&& this(handler) {
if (handler.sessionUser == null) return false;
- return (handler.sessionUser.isAdmin() && handler.sessionUser.isActivate());
+ return (handler.sessionUser.isAdmin() && handler.sessionUser.isActive());
}
}
Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java (original)
+++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java Tue May 19 13:19:40 2009
@@ -27,8 +27,8 @@
if (this.sessionUser == null) {
return handleRequest().doShow();
} else {
- if(this.sessionUser.isActivate()){
- return new TemplatingProducer("loginMenu").addParameter(this.sessionUser);
+ if(this.sessionUser.isActive()){
+ return new TemplatingProducer("loginMenu").addParameter(this.sessionUser);
} else {
return doInactive();
}
@@ -44,7 +44,7 @@
if (this.sessionUser == null) {
return new TemplatingProducer("smallLogin");
} else {
- if(this.sessionUser.isActivate()){
+ if(this.sessionUser.isActive()){
return new TemplatingProducer("smallLoginMenu").addParameter(this.sessionUser);
} else {
return doInactive();
Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserCrud.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserCrud.java?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserCrud.java (original)
+++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserCrud.java Tue May 19 13:19:40 2009
@@ -1,5 +1,6 @@
package org.apache.magma.web.user;
+import org.apache.magma.website.HtmlProducer;
import org.apache.magma.website.admin.CompleteCrudHandler;
import org.apache.magma.domain.user.User;
Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java (original)
+++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java Tue May 19 13:19:40 2009
@@ -15,15 +15,16 @@
import org.apache.magma.website.beansview.ShowList;
import org.apache.magma.website.beansview.SmartForm;
import org.apache.magma.website.producers.StringHtmlProducer;
+import org.apache.magma.website.producers.TemplatingProducer;
import org.apache.magma.website.velocity.VelocityHtmlProducer;
public class UserWebHandler extends WebHandler{
- protected ViewCustomizer register = new SimpleViewFilter("-admin","-activate");
+ protected ViewCustomizer register = new SimpleViewFilter("-admin","-active");
protected ViewCustomizer showRegister = new SimpleViewFilter("-admin","-confirmPassword");
protected ViewCustomizer listCustomizer = null;
- protected ViewCustomizer showCustomizer = new SimpleViewFilter("-admin","-activate", "-confirmPassword");
+ protected ViewCustomizer showCustomizer = new SimpleViewFilter("-admin","-active", "-confirmPassword");
protected ViewCustomizer editCustomizer = null;
- protected ViewCustomizer edit = new SimpleViewFilter("-activate","-admin","-name","-surname");
+ protected ViewCustomizer edit = new SimpleViewFilter("-active","-admin","-name","-surname");
private User sessionUser;
@@ -41,22 +42,35 @@
return passwordError;
}
new Database().save(user);
- HtmlProducer mailprod = new VelocityHtmlProducer("activation").addParameter("user",user);
- mailprod.compoundWith(new ShowBean(user), CompoundType.AFTER);
- Email mail = new Email();
- mail.to(user.getEmail());
- mail.subject("Account Activation");
- mail.html(mailprod);
- mail.send();
- return doShow(user);
+ try {
+ HtmlProducer mailprod = new TemplatingProducer("/org/apache/magma/web/user/activation").addParameter("user",user);
+ mailprod.compoundWith(new ShowBean(user), CompoundType.AFTER);
+ Email mail = new Email();
+ mail.to(user.getEmail());
+ mail.subject("Account Activation");
+ mail.html(mailprod);
+ mail.send();
+ } catch (Exception e) {
+ e.printStackTrace();
+ StringHtmlProducer error = new StringHtmlProducer("Error sending email");
+ error.compoundWith(handleNewUser().doShow(), CompoundType.AFTER);
+ return error;
+ }
+ return doRegistered(user);
+ }
+
+ public HtmlProducer doRegistered(User user) {
+ return (HtmlProducer) doShow(user).compoundWith(new TemplatingProducer("registered").addParameter("user", user), CompoundType.BEFORE);
}
public HtmlProducer doActivate(User user){
- user.setActivate(true);
+ user.setActive(true);
new Database().save(user);
- return new VelocityHtmlProducer("thanks.vm").addParameter("user", user);
+ return new TemplatingProducer("activated").addParameter("user", user);
}
+
+
public HtmlProducer doShow(User user) {
ShowBean showBean = new ShowBean(user, showCustomizer);
HtmlProducer header = new VelocityHtmlProducer("listHeader").addParameter("Info " + user.getName()+ " " + user.getSurname());
@@ -79,13 +93,16 @@
public HtmlProducer hiddenEdit(User user) {
new Database().save(user);
- HtmlProducer mailprod = new VelocityHtmlProducer("edit").addParameter("user",user);
- mailprod.compoundWith(new ShowBean(user), CompoundType.AFTER);
- Email mail = new Email();
- mail.to(user.getEmail());
- mail.subject("Your Site: Edit User Info");
- mail.html(mailprod);
- mail.send();
+ try {
+ HtmlProducer mailprod = new VelocityHtmlProducer("edit").addParameter("user",user);
+ mailprod.compoundWith(new ShowBean(user), CompoundType.AFTER);
+ Email mail = new Email();
+ mail.to(user.getEmail());
+ mail.subject("Edit User Info");
+ mail.html(mailprod);
+ mail.send();
+ } catch (Exception e) {
+ }
return doShow(user);
}
}
Added: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activated.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activated.vm?rev=776304&view=auto
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activated.vm (added)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activated.vm Tue May 19 13:19:40 2009
@@ -0,0 +1,6 @@
+<h1 >
+ $i18n.tr("Account activated")
+</h1>
+ <p >
+ $i18n.tr("Hi ") $user.name , $i18n.tr("your account has been activated, you can now login into the site")
+ </p>
Modified: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activation.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activation.vm?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activation.vm (original)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/activation.vm Tue May 19 13:19:40 2009
@@ -1,7 +1,7 @@
<h1 >
- $i18n.tr("YourSite : Account Activation")
+ $i18n.tr("Account Activation")
</h1>
- <p>$18n.tr("Welcome") $user.name, $i18n.tr("to complete your registration follow the link and activate your account:")</p>
+ <p>$i18n.tr("Welcome") $user.name, $i18n.tr("to complete your registration follow the link and activate your account:")</p>
<p ><a href="magma:/user/activate!$user.id">$i18n.tr("Activate!")</a></p>
<p >
$i18n.tr("Your Personal info:")
Modified: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/loginerror.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/loginerror.vm?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/loginerror.vm (original)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/loginerror.vm Tue May 19 13:19:40 2009
@@ -2,8 +2,8 @@
<p>$i18n.tr("Email or password you type in are incorrect!")</p>
<div id="register">
<ul>
- <li><a href="magma:/">$i18n.tr("Login!")</a></li>
- <li><a href="magma:/users/newUser/">$i18n.tr(" Registrati!")</a></li>
+ <li><a href="magma:/">$i18n.tr("Login")</a></li>
+ <li><a href="magma:/users/newUser/">$i18n.tr("Register")</a></li>
<li><a href="magma:/login/resendPassword">$i18n.tr("Forgot your Password?")</a></li>
</ul>
</div>
Modified: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/notactive.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/notactive.vm?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/notactive.vm (original)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/notactive.vm Tue May 19 13:19:40 2009
@@ -2,7 +2,6 @@
$i18n.tr("Inactive Account")
</h1>
<p >
- $i18n.tr("To Activate your Account check your mailbox and follow the link that we provide to send you in our
- activation e-mail.")
+ $i18n.tr("To Activate your Account check your mailbox and follow the link that we provide to send you in our activation e-mail.")
</p>
\ No newline at end of file
Added: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/registered.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/registered.vm?rev=776304&view=auto
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/registered.vm (added)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/registered.vm Tue May 19 13:19:40 2009
@@ -0,0 +1,3 @@
+<p>
+ $i18n.tr("Thanks for registering, a mail will be sent to you address to confirm its validity.");
+</p>
\ No newline at end of file
Modified: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/settings.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/settings.vm?rev=776304&r1=776303&r2=776304&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/settings.vm (original)
+++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/settings.vm Tue May 19 13:19:40 2009
@@ -1,4 +1,4 @@
<h1>$i18n.tr("User Settings")</h1>
$i18n.tr("Hi") $user.name
-<a href="magma:/user/editProfile/">$i18n.tr("Edit!")</a><br>
+<a href="magma:/user/editProfile/">$i18n.tr("Edit your profile")</a><br>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org