[Pollen-commits] r3702 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/json resources resources/config webapp/WEB-INF/jsp/admin webapp/WEB-INF/jsp/user webapp/js

Author: tchemit Date: 2012-09-23 15:48:42 +0200 (Sun, 23 Sep 2012) New Revision: 3702 Url: http://chorem.org/repositories/revision/pollen/3702 Log: normalize json actions (all will use a data field Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml trunk/pollen-ui-struts2/src/main/resources/struts.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.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 trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -28,6 +28,8 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import java.util.Map; + /** * Abstract JSON action with pagination support. * @@ -38,6 +40,8 @@ private static final long serialVersionUID = 1L; + public abstract Map<String, Object>[] getData(); + public final Integer getRows() { return pager.getPageSize(); } Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -0,0 +1,18 @@ +package org.chorem.pollen.ui.actions.json; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.util.Map; + +/** + * Abstract JSON action for a simple result (one row). + * + * @author tchemit <chemit@codelutin.com> + * @since 1.5 + */ +public abstract class AbstractJSONSimpleAction extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public abstract Map<String, Object> getData(); +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -44,10 +44,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] polls; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getPolls() { - return polls; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -59,7 +60,7 @@ pager, getPollenUserAccount()); - polls = new Map[pollList.size()]; + data = new Map[pollList.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; @@ -72,7 +73,7 @@ map.put("resultId", poll.getPollId()); map.put("adminId", poll.getAdminId()); map.put("functions", getPollFunctions(poll)); - polls[index++] = map; + data[index++] = map; } return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -24,7 +24,6 @@ import com.google.common.collect.Maps; import org.chorem.pollen.business.persistence.PersonList; -import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; @@ -34,13 +33,13 @@ * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class GetFavoriteList extends PollenActionSupport { +public class GetFavoriteList extends AbstractJSONSimpleAction { private static final long serialVersionUID = 1L; private String favoriteListId; - private transient Map<String, Object> favoriteList; + private transient Map<String, Object> data; public String getFavoriteListId() { return favoriteListId; @@ -50,8 +49,9 @@ this.favoriteListId = favoriteListId; } - public Map<String, Object> getFavoriteList() { - return favoriteList; + @Override + public Map<String, Object> getData() { + return data; } @Override @@ -60,9 +60,9 @@ PersonList personList = getFavoriteService().getEntityById(PersonList.class, favoriteListId); - favoriteList = Maps.newHashMap(); - favoriteList.put("id", personList.getTopiaId()); - favoriteList.put(PersonList.PROPERTY_NAME, personList.getName()); + data = Maps.newHashMap(); + data.put("id", personList.getTopiaId()); + data.put(PersonList.PROPERTY_NAME, personList.getName()); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -24,7 +24,6 @@ import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.entities.PollenBinderHelper; -import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.util.beans.Binder; import java.util.Map; @@ -35,13 +34,13 @@ * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class GetFavoriteListPollAccount extends PollenActionSupport { +public class GetFavoriteListPollAccount extends AbstractJSONSimpleAction { private static final long serialVersionUID = 1L; private String pollAccountId; - private transient Map<String, Object> pollAccount; + private transient Map<String, Object> data; public String getPollAccountId() { return pollAccountId; @@ -51,8 +50,9 @@ this.pollAccountId = pollAccountId; } - public Map<String, Object> getPollAccount() { - return pollAccount; + @Override + public Map<String, Object> getData() { + return data; } @Override @@ -63,12 +63,12 @@ Binder<PollAccount, PollAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class); - pollAccount = binder.obtainProperties( + data = binder.obtainProperties( userAccount, PollAccount.PROPERTY_VOTING_ID, PollAccount.PROPERTY_EMAIL ); - pollAccount.put("id", userAccount.getTopiaId()); + data.put("id", userAccount.getTopiaId()); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -41,12 +41,13 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] pollAccounts; + protected transient Map<String, Object>[] data; protected String favoriteListId; - public Map<String, Object>[] getPollAccounts() { - return pollAccounts; + @Override + public Map<String, Object>[] getData() { + return data; } public String getFavoriteListId() { @@ -69,7 +70,7 @@ favoriteList, pager); - pollAccounts = new Map[allPollAccounts.size()]; + data = new Map[allPollAccounts.size()]; Binder<PollAccount, PollAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class); int index = 0; @@ -80,7 +81,7 @@ PollAccount.PROPERTY_EMAIL ); map.put("id", pollAccount.getTopiaId()); - pollAccounts[index++] = map; + data[index++] = map; } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -38,10 +38,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] favoriteLists; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getFavoriteLists() { - return favoriteLists; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -51,14 +52,14 @@ getPollenUserAccount(), pager); - favoriteLists = new Map[allFavoriteLists.size()]; + data = new Map[allFavoriteLists.size()]; int index = 0; for (PersonList favoriteList : allFavoriteLists) { Map<String, Object> map = Maps.newHashMap(); map.put(PersonList.PROPERTY_NAME, favoriteList.getName()); map.put("id", favoriteList.getTopiaId()); map.put("nbAccounts", favoriteList.sizePollAccount()); - favoriteLists[index++] = map; + data[index++] = map; } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -47,10 +47,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] polls; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getPolls() { - return polls; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -61,7 +62,7 @@ List<Pair<Poll, PollAccount>> invitedPolls = pollService.getInvitedPolls(pager, getPollenUserAccount()); - polls = new Map[invitedPolls.size()]; + data = new Map[invitedPolls.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; @@ -81,7 +82,7 @@ Set<String> functions = getPollFunctions(poll, pollUri); map.put("functions", functions); - polls[index++] = map; + data[index++] = map; } return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -47,10 +47,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] polls; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getPolls() { - return polls; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -61,7 +62,7 @@ List<Pair<Poll, PollAccount>> participatedPolls = pollService.getParticipatedPolls(pager, getPollenUserAccount()); - polls = new Map[participatedPolls.size()]; + data = new Map[participatedPolls.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; @@ -87,7 +88,7 @@ Set<String> functions = getPollFunctions(poll, pollUri); map.put("functions", functions); - polls[index++] = map; + data[index++] = map; } return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -44,7 +44,7 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] comments; + protected transient Map<String, Object>[] data; protected String pollId; @@ -52,8 +52,9 @@ this.pollId = pollId; } - public Map<String, Object>[] getComments() { - return comments; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -71,7 +72,7 @@ getPollenUserAccount(), pollId, null, poll); securityContext.loadUserRoles(getSecurityService()); - comments = new Map[commentList.size()]; + data = new Map[commentList.size()]; Binder<Comment, Comment> binder = PollenBinderHelper.getSimpleTopiaBinder(Comment.class); int index = 0; @@ -88,7 +89,7 @@ comment, securityContext); map.put("functions", functions); - comments[index++] = map; + data[index++] = map; } return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -41,10 +41,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] polls; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getPolls() { - return polls; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -54,7 +55,7 @@ List<Poll> pollList = pollService.getPolls(pager); - polls = new Map[pollList.size()]; + data = new Map[pollList.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; @@ -64,7 +65,7 @@ map.put("adminId", poll.getAdminId()); map.put("functions", Sets.newHashSet("summary")); - polls[index++] = map; + data[index++] = map; } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -24,7 +24,6 @@ import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.entities.PollenBinderHelper; -import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.util.beans.Binder; import java.util.Map; @@ -35,13 +34,13 @@ * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class GetUser extends PollenActionSupport { +public class GetUser extends AbstractJSONSimpleAction { private static final long serialVersionUID = 1L; private String userId; - private transient Map<String, Object> user; + private transient Map<String, Object> data; public String getUserId() { return userId; @@ -51,8 +50,9 @@ this.userId = userId; } - public Map<String, Object> getUser() { - return user; + @Override + public Map<String, Object> getData() { + return data; } @Override @@ -63,10 +63,8 @@ Binder<UserAccount, UserAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); - user = binder.obtainProperties( - userAccount - ); - user.put("id", userAccount.getTopiaId()); + data = binder.obtainProperties(userAccount); + data.put("id", userAccount.getTopiaId()); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-09-23 13:48:42 UTC (rev 3702) @@ -41,10 +41,11 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] users; + protected transient Map<String, Object>[] data; - public Map<String, Object>[] getUsers() { - return users; + @Override + public Map<String, Object>[] getData() { + return data; } @Override @@ -53,7 +54,7 @@ List<UserAccount> allUsers = getUserService().getUsers(pager); UserAccount userAccount = getPollenUserAccount(); - users = new Map[allUsers.size()]; + data = new Map[allUsers.size()]; Binder<UserAccount, UserAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); int index = 0; @@ -65,7 +66,7 @@ Set<String> functions = getUserFunctions(userAccount, user); map.put("functions", functions); - users[index++] = map; + data[index++] = map; } return SUCCESS; Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-09-23 13:48:42 UTC (rev 3702) @@ -28,7 +28,8 @@ <package name="json" extends="default" namespace="/json"> - <action name="get*" class="org.chorem.pollen.ui.actions.json.Get{1}"> + <action name="get*" class="org.chorem.pollen.ui.actions.json.Get{1}" + method="execute"> <interceptor-ref name="pollenBasicStack"/> <result type="json"/> </action> Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-09-23 13:48:42 UTC (rev 3702) @@ -44,13 +44,13 @@ <constant name="struts.enable.SlashesInActionNames" value="true"/> <constant name="struts.devMode" value="false"/> - <bean class="org.chorem.pollen.services.PollenServiceFactory" /> + <bean class="org.chorem.pollen.services.PollenServiceFactory"/> <!--Performance tuning--> <!--see http://struts.apache.org/2.2.3/docs/performance-tuning.html--> <constant name="struts.freemarker.templatesCache" value="true"/> - <package name="default" extends="json-default" namespace="/"> + <package name="default" extends="struts-default" namespace="/"> <result-types> <result-type name="redirectToHome" @@ -67,6 +67,14 @@ <param name="location">${redirectUrl}</param> <param name="prependServletContext">false</param> </result-type> + + <result-type name="json" class="org.apache.struts2.json.JSONResult"> + <param name="includeProperties"> + rows,page,total,records,data,data.*,sord,sidx,filters,searchField,searchString,searchOper + </param> + <param name="ignoreHierarchy">false</param> + <!--<param name="defaultEncoding">UTF-8</param>--> + </result-type> </result-types> <interceptors> @@ -92,7 +100,9 @@ <interceptor-ref name="multiselect"/> <interceptor-ref name="actionMappingParams"/> <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*</param> + <param name="excludeParams"> + dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...* + </param> </interceptor-ref> <interceptor-ref name="conversionError"/> </interceptor-stack> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -36,7 +36,7 @@ <s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> -<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="polls" +<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" 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-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -56,7 +56,7 @@ }); </script> -<sjg:grid id="users" dataType="json" href="%{loadUsers}" gridModel="users" +<sjg:grid id="users" dataType="json" href="%{loadUsers}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editinline="false" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -55,7 +55,7 @@ <s:url id="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> -<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="polls" +<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" 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-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -71,7 +71,7 @@ </h1> <sjg:grid id="pollAccounts" dataType="json" href="%{loadPollAccounts}" - gridModel="pollAccounts" sortable="true" pager="true" + gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='pollAccounts-rowSelect' editinline="false" 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-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -69,7 +69,7 @@ </div> </s:set> <sjg:grid id="favoriteLists" dataType="json" href='%{loadFavoriteLists}' - gridModel="favoriteLists" sortable="true" pager="true" + gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" viewrecords="true" onSelectRowTopics='favoriteLists-rowSelect' Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -39,7 +39,7 @@ <s:url id="loadInvitedUrl" action="getInvitedPolls" namespace="/json" escapeAmp="false"/> -<sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="polls" +<sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-09-23 13:48:42 UTC (rev 3702) @@ -39,7 +39,7 @@ <s:url id="loadParticipatedUrl" action="getParticipatedPolls" namespace="/json" escapeAmp="false"/> -<sjg:grid dataType="json" href="%{loadParticipatedUrl}" gridModel="polls" +<sjg:grid dataType="json" href="%{loadParticipatedUrl}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-09-23 13:48:42 UTC (rev 3702) @@ -80,7 +80,7 @@ jQuery.getJSON( loadPollActionUrl, { "pollAccountId":id }, function (result) { - var pollAccount = result.pollAccount; + var pollAccount = result.data; $('#editForm [name="editPollAccount.topiaId"]').val(pollAccount.id); $('#editForm [name="editPollAccount.votingId"]').val(pollAccount.votingId); $('#editForm [name="editPollAccount.email"]').val(pollAccount.email); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-09-23 13:16:05 UTC (rev 3701) +++ trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-09-23 13:48:42 UTC (rev 3702) @@ -89,7 +89,7 @@ jQuery.getJSON( loadUserUrl, { "userId":id }, function (result) { - var user = result.user; + var user = result.data; $('#editForm [name="editUser.topiaId"]').val(user.id); $('#editForm [name="editUser.login"]').val(user.login); $('#editForm [name="editUser.email"]').val(user.email);