Author: tchemit Date: 2012-01-23 18:32:00 +0100 (Mon, 23 Jan 2012) New Revision: 3107 Url: http://chorem.org/repositories/revision/pollen/3107 Log: do not display CUD form Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/CreateUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/UpdateUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/usersList.jsp Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/CreateUser.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/CreateUser.java 2012-01-23 17:22:39 UTC (rev 3106) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/CreateUser.java 2012-01-23 17:32:00 UTC (rev 3107) @@ -27,6 +27,10 @@ return createUser; } + public boolean isCreateUserNotNull() { + return createUser !=null; + } + @Override public String execute() throws Exception { Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-01-23 17:22:39 UTC (rev 3106) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-01-23 17:32:00 UTC (rev 3107) @@ -25,6 +25,10 @@ return deleteUser; } + public boolean isDeleteUserNotNull() { + return deleteUser !=null; + } + @Override public String execute() throws Exception { Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/UpdateUser.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/UpdateUser.java 2012-01-23 17:22:39 UTC (rev 3106) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/UpdateUser.java 2012-01-23 17:32:00 UTC (rev 3107) @@ -27,6 +27,10 @@ return updateUser; } + public boolean isUpdateUserNotNull() { + return updateUser !=null; + } + @Override public String execute() throws Exception { Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/usersList.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/usersList.jsp 2012-01-23 17:22:39 UTC (rev 3106) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/usersList.jsp 2012-01-23 17:32:00 UTC (rev 3107) @@ -37,13 +37,13 @@ <script type="text/javascript"> jQuery(document).ready(function () { - if ('${createUser}' != '') { + if ('${createUserNotNull}' == 'true') { $('#createForm').show(); } - if ('${updateUser}' != '') { + if ('${updateUserNotNull}' == 'true') { $('#editForm').show(); } - if ('${deleteUser}' != '') { + if ('${deleteUserNotNull}' == 'true') { $('#deleteForm').show(); }