r3522 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/admin java/org/chorem/pollen/ui/actions/user resources/org/chorem/pollen/ui/actions webapp/WEB-INF/jsp/admin webapp/WEB-INF/jsp/poll webapp/WEB-INF/jsp/user - Pollen-commits

19 Jun 2012

Author: tchemit
Date: 2012-06-19 12:18:41 +0200 (Tue, 19 Jun 2012)
New Revision: 3522

Url: http://chorem.org/repositories/revision/pollen/3522

Log:
remove old xml validation files + fix some jps bugs

Removed:
   trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/
   trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/
Modified:
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
   trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp
   trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
   trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp
   trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp
   trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
===================================================================

--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-06-19 10:18:41 UTC (rev 3522)
@@ -23,11 +23,14 @@
 package org.chorem.pollen.ui.actions.admin;
 
 import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.StringUtils;
+import org.chorem.pollen.business.persistence.PollAccount;
 import org.chorem.pollen.business.persistence.UserAccount;
 import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
 import org.chorem.pollen.services.exceptions.UserInvalidPasswordException;
 import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
+import org.nuiton.util.StringUtil;
 
 /**
  * @author tchemit <chemit@codelutin.com>
@@ -68,6 +71,44 @@
         this.action = action;
     }
 
+    @Override
+    public void validate() {
+
+        if ("create".equals(action)) {
+
+            UserAccount account = getCreateUser();
+
+            if (StringUtils.isBlank(account.getLogin())) {
+                addFieldError("createUser.login",
+                              _("pollen.error.login.required"));
+            }
+
+            if (StringUtils.isBlank(account.getEmail())) {
+                addFieldError("createUser.email",
+                              _("pollen.error.email.required"));
+            } else if (!StringUtil.isEmail(account.getEmail())) {
+                addFieldError("createUser.email",
+                              _("pollen.error.email.invalid"));
+            }
+        } else if ("edit".equals(action)) {
+
+            UserAccount account = getEditUser();
+
+            if (StringUtils.isBlank(account.getLogin())) {
+                addFieldError("editUser.login",
+                              _("pollen.error.pollAccount.votingId.required"));
+            }
+
+            if (StringUtils.isBlank(account.getEmail())) {
+                addFieldError("editUser.email",
+                              _("pollen.error.email.required"));
+            } else if (!StringUtil.isEmail(account.getEmail())) {
+                addFieldError("editUser.email",
+                              _("pollen.error.email.invalid"));
+            }
+        }
+    }
+
     public String create() throws Exception {
 
         Preconditions.checkNotNull(user);

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java	2012-06-19 10:18:41 UTC (rev 3522)
@@ -22,11 +22,14 @@
  */
 package org.chorem.pollen.ui.actions.user;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.chorem.pollen.business.persistence.UserAccount;
 import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
 import org.chorem.pollen.services.exceptions.UserInvalidPasswordException;
 import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
+import org.nuiton.util.StringUtil;
 
 /**
  * Update a user.
@@ -79,7 +82,34 @@
         return INPUT;
     }
 
+
     @Override
+    public void validate() {
+
+        if (StringUtils.isBlank(user.getLogin())) {
+            addFieldError("user.login", _("pollen.error.login.required"));
+        }
+
+        if (StringUtils.isBlank(user.getPassword())) {
+            addFieldError("user.password", _("pollen.error.password.required"));
+        }
+
+        if (StringUtils.isNotBlank(getNewPassword())) {
+            if (ObjectUtils.notEqual(getNewPassword(), getNewPassword2())) {
+                addFieldError("newPassword", _("pollen.error.passwords.not.equals"));
+            }
+        }
+
+        if (StringUtils.isBlank(user.getEmail())) {
+            addFieldError("user.email", _("pollen.error.email.required"));
+        }
+
+        if (!StringUtil.isEmail(user.getEmail())) {
+            addFieldError("user.email", _("pollen.error.email.invalid"));
+        }
+    }
+
+    @Override
     public String execute() throws Exception {
 
         // let's push back admin property to user to save

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java	2012-06-19 10:18:41 UTC (rev 3522)
@@ -24,15 +24,16 @@
 
 import com.google.common.base.Preconditions;
 import com.opensymphony.xwork2.Preparable;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.struts2.interceptor.ParameterAware;
 import org.chorem.pollen.business.persistence.PersonList;
 import org.chorem.pollen.business.persistence.PollAccount;
 import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException;
 import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException;
 import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException;
-import org.chorem.pollen.services.impl.FavoriteService;
 import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
+import org.nuiton.util.StringUtil;
 
 import java.util.Map;
 
@@ -108,6 +109,44 @@
         }
     }
 
+    @Override
+    public void validate() {
+
+        if ("create".equals(action)) {
+
+            PollAccount account = getCreatePollAccount();
+
+            if (StringUtils.isBlank(account.getVotingId())) {
+                addFieldError("createPollAccount.votingId",
+                              _("pollen.error.pollAccount.votingId.required"));
+            }
+
+            if (StringUtils.isBlank(account.getEmail())) {
+                addFieldError("createPollAccount.email",
+                              _("pollen.error.email.required"));
+            } else if (!StringUtil.isEmail(account.getEmail())) {
+                addFieldError("createPollAccount.email",
+                              _("pollen.error.email.invalid"));
+            }
+        } else if ("edit".equals(action)) {
+
+            PollAccount account = getEditPollAccount();
+
+            if (StringUtils.isBlank(account.getVotingId())) {
+                addFieldError("editPollAccount.votingId",
+                              _("pollen.error.pollAccount.votingId.required"));
+            }
+
+            if (StringUtils.isBlank(account.getEmail())) {
+                addFieldError("editPollAccount.email",
+                              _("pollen.error.email.required"));
+            } else if (!StringUtil.isEmail(account.getEmail())) {
+                addFieldError("editPollAccount.email",
+                              _("pollen.error.email.invalid"));
+            }
+        }
+    }
+
     public String create() throws Exception {
 
         Preconditions.checkNotNull(favoriteList);

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java	2012-06-19 10:18:41 UTC (rev 3522)
@@ -102,6 +102,18 @@
         return PageSkin.EDITION;
     }
 
+    @Override
+    public void validate() {
+
+        if ("create".equals(action)) {
+
+            if( StringUtils.isBlank(getCreateFavoriteList().getName())) {
+                addFieldError("createFavoriteList.name",
+                              _("pollen.error.favoriteListName.required"));
+            }
+        }
+    }
+
     public String create() throws Exception {
 
         Preconditions.checkNotNull(favoriteList);

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java	2012-06-19 10:18:41 UTC (rev 3522)
@@ -22,11 +22,14 @@
  */
 package org.chorem.pollen.ui.actions.user;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.chorem.pollen.business.persistence.UserAccount;
 import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
 import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException;
 import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
+import org.nuiton.util.StringUtil;
 
 /**
  * Register a new user.
@@ -63,6 +66,34 @@
     }
 
     @Override
+    public void validate() {
+
+        if (StringUtils.isBlank(user.getLogin())) {
+            addFieldError("user.login", _("pollen.error.login.required"));
+        }
+
+        if (StringUtils.isBlank(user.getPassword())) {
+            addFieldError("user.password", _("pollen.error.password.required"));
+        }
+
+        if (StringUtils.isBlank(getPassword2())) {
+            addFieldError("password2", _("pollen.error.password2.required"));
+        }
+
+        if (ObjectUtils.notEqual(getPassword2(), user.getPassword())) {
+            addFieldError("password2", _("pollen.error.passwords.not.equals"));
+        }
+
+        if (StringUtils.isBlank(user.getEmail())) {
+            addFieldError("user.email", _("pollen.error.email.required"));
+        }
+
+        if (!StringUtil.isEmail(user.getEmail())) {
+            addFieldError("user.email", _("pollen.error.email.invalid"));
+        }
+    }
+
+    @Override
     public String execute() throws Exception {
 
         String result = INPUT;

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp
===================================================================
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp	2012-06-19 10:18:41 UTC (rev 3522)
@@ -30,7 +30,7 @@
   <fieldset class="ui-widget-content ui-corner-all">
 
     <s:hidden key="redirectUrl" label=''/>
-    <s:hidden key="userId" value='%{user.topiaId}' label=''/>
+    <s:hidden key="userId" value='%{#user.topiaId}' label=''/>
 
     <s:text name="pollen.information.confirmDeleteUser"/>
     <div align="center" style="padding-top: 1em;">

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
===================================================================
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp	2012-06-19 10:18:41 UTC (rev 3522)
@@ -51,8 +51,8 @@
   var deleteImg = '<s:url value='/img/delete.png'/>';
 
   jQuery(document).ready(function () {
-    initUsersPage("<s:property value='%{action}'/>",
-                  "<s:property value='%{user.topiaId}'/>");
+    initUsersPage("<s:property value='%{#action.action}'/>",
+                  "<s:property value='%{#user.topiaId}'/>");
   });
 </script>
 

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp
===================================================================
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp	2012-06-19 10:18:41 UTC (rev 3522)
@@ -56,31 +56,6 @@
     return false;
   }
 
-  var autoSelect = function () {
-    var el = $(this)[0];
-    if (/textarea/i.test(el.tagName) || (/input/i.test(el.tagName) && /text/i.test(el.type))) {
-      el.select();
-    } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera
-      var sel = window.getSelection();
-      var range = document.createRange();
-      range.selectNodeContents(el);
-      sel.removeAllRanges();
-      sel.addRange(range);
-    } else if (!!document.selection) { // IE
-      document.selection.empty();
-      var range = document.body.createTextRange();
-      range.moveToElementText(el);
-      range.select();
-    }
-  };
-
-  $(document).load(function() {
-
-
-      $('.url').click(autoSelect);
-
-  })
-
 </script>
 
 <h1 class="titleCreation"><s:property value="poll.title"/></h1>
@@ -194,3 +169,34 @@
 </div>
 
 <sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/>
+
+
+
+<script type="text/javascript">
+
+  var autoSelect = function () {
+    var el = $(this)[0];
+    if (/textarea/i.test(el.tagName) || (/input/i.test(el.tagName) && /text/i.test(el.type))) {
+      el.select();
+    } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera
+      var sel = window.getSelection();
+      var range = document.createRange();
+      range.selectNodeContents(el);
+      sel.removeAllRanges();
+      sel.addRange(range);
+    } else if (!!document.selection) { // IE
+      document.selection.empty();
+      var range = document.body.createTextRange();
+      range.moveToElementText(el);
+      range.select();
+    }
+  };
+
+  $(document).load(function() {
+
+
+    $('.url').click(autoSelect);
+
+  })
+
+</script>
\ No newline at end of file

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp
===================================================================
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp	2012-06-19 10:18:41 UTC (rev 3522)
@@ -52,7 +52,7 @@
 
   jQuery(document).ready(function () {
 
-    initFavoritePage("<s:property value='%{action}'/>");
+    initFavoritePage("<s:property value='%{#action.action}'/>");
   });
 </script>
 

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp
===================================================================
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp	2012-06-19 08:53:57 UTC (rev 3521)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp	2012-06-19 10:18:41 UTC (rev 3522)
@@ -57,7 +57,7 @@
 
   jQuery(document).ready(function () {
 
-    initFavoritesPage("<s:property value='%{action}'/>");
+    initFavoritesPage("<s:property value='%{#action.action}'/>");
   });
 </script>

    

r3522 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/admin java/org/chorem/pollen/ui/actions/user resources/org/chorem/pollen/ui/actions webapp/WEB-INF/jsp/admin webapp/WEB-INF/jsp/poll webapp/WEB-INF/jsp/user

tchemit＠users.chorem.org

tags

participants (1)