Author: tchemit Date: 2012-03-14 18:22:21 +0100 (Wed, 14 Mar 2012) New Revision: 3191 Url: http://chorem.org/repositories/revision/pollen/3191 Log: fix delete poll from admin Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-03-14 16:59:04 UTC (rev 3190) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-03-14 17:22:21 UTC (rev 3191) @@ -92,6 +92,7 @@ Poll.PROPERTY_END_DATE ); map.put("id", poll.getTopiaId()); + map.put("adminId", poll.getAdminId()); Set<String> functions = getPollFunctions(poll); map.put("functions", functions); polls[index++] = map; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-03-14 16:59:04 UTC (rev 3190) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-03-14 17:22:21 UTC (rev 3191) @@ -24,7 +24,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> - +<script type="text/javascript"> + var redirectUrl = '<s:url namespace="/admin" action="pollsList"/>'; +</script> <%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> <title><s:text name="pollen.title.pollsList"/></title>