Author: simoneg
Date: Wed Oct 21 13:02:52 2009
New Revision: 828000
URL: http://svn.apache.org/viewvc?rev=828000&view=rev
Log:
LABS-492: reimplementing filters as layers
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/UserWebHandler.java
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=828000&r1=827999&r2=828000&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
Wed Oct 21 13:02:52 2009
@@ -37,6 +37,10 @@
@Entity
@Table(name="MUser")
public class User implements LogicallyNamed {
+
+ public static final String
+ LAYER_SECRET = "secret";
+
private String name;
private String surname;
private String email;
@@ -74,7 +78,7 @@
this.email = email;
}
- @MagView(order=4,password=true)
+ @MagView(order=4,password=true, defaultLayer=false, layers=LAYER_SECRET)
@Required
@Length(min=4)
public String getPassword() {
@@ -84,7 +88,7 @@
this.password = password;
}
- @MagView(order=5,password=true)
+ @MagView(order=5,password=true, defaultLayer=false, layers=LAYER_SECRET)
@Transient
@Required
@Length(min=4)
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=828000&r1=827999&r2=828000&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
Wed Oct 21 13:02:52 2009
@@ -22,8 +22,7 @@
import org.apache.magma.database.Database;
import org.apache.magma.email.Email;
-import org.apache.magma.view.tree.SimpleViewFilter;
-import org.apache.magma.view.tree.ViewCustomizer;
+import org.apache.magma.view.MagDefaultLayers;
import org.apache.magma.website.CompoundType;
import org.apache.magma.website.HtmlProducer;
import org.apache.magma.website.WebHandler;
@@ -35,19 +34,13 @@
import org.apache.magma.website.velocity.VelocityHtmlProducer;
public class UserWebHandler extends WebHandler{
- protected ViewCustomizer register = new
SimpleViewFilter("-admin","-active");
- protected ViewCustomizer showRegister = new
SimpleViewFilter("-admin","-confirmPassword");
- protected ViewCustomizer listCustomizer = null;
- protected ViewCustomizer showCustomizer = new
SimpleViewFilter("-admin","-active", "-confirmPassword");
- protected ViewCustomizer editCustomizer = null;
- protected ViewCustomizer edit = new
SimpleViewFilter("-active","-admin","-name","-surname");
private User sessionUser;
public SmartForm handleNewUser() {
User user = new User();
HtmlProducer header = new
VelocityHtmlProducer("listHeader").addParameter("New User");
- return new SmartForm(user, "hiddenRegister",
header).setFilter(register);
+ return new SmartForm(user, "hiddenRegister",
header).setLayers(MagDefaultLayers.DEFAULT, User.LAYER_SECRET);
}
public HtmlProducer hiddenRegister(User user) {
@@ -92,7 +85,7 @@
public HtmlProducer doShow(User user) {
- ShowBean showBean = new ShowBean(user, showCustomizer);
+ ShowBean showBean = new ShowBean(user);
HtmlProducer header = new
VelocityHtmlProducer("listHeader").addParameter("Info " + user.getName()+ " " +
user.getSurname());
showBean.compoundWith(header, CompoundType.BEFORE);
return showBean;
@@ -100,7 +93,7 @@
public HtmlProducer doList() {
List<User> query = new Database().query(User.class, "");
- ShowList showList = new ShowList(User.class, query,
listCustomizer, "doShow");
+ ShowList showList = new ShowList(User.class, query, "doShow");
HtmlProducer header = new
VelocityHtmlProducer("listHeader").addParameter("Users List");
showList.compoundWith(header, CompoundType.BEFORE);
return showList;
@@ -108,7 +101,7 @@
public SmartForm handleEditProfile(){
HtmlProducer header = new
VelocityHtmlProducer("listHeader").addParameter("Edit Profile Settings");
- return new SmartForm(sessionUser, "hiddenEdit",
header).setFilter(edit);
+ return new SmartForm(sessionUser, "hiddenEdit",
header).setLayers(MagDefaultLayers.DEFAULT, User.LAYER_SECRET);
}
public HtmlProducer hiddenEdit(User user) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
