From tchemit@users.chorem.org Wed Mar 14 18:22:21 2012
From: tchemit@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3191 - in
	branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main:
	java/org/chorem/pollen/ui/actions/json webapp/WEB-INF/jsp/admin
Date: Wed, 14 Mar 2012 18:22:21 +0100
Message-ID: <20120314172221.CBEA9161BD@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2041349907542794914=="

--===============2041349907542794914==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/p=
ollen/ui/actions/json/GetPolls.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/js=
p/admin/pollsList.jsp

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/c=
horem/pollen/ui/actions/json/GetPolls.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D getPollFunctions(poll);
             map.put("functions", functions);
             polls[index++] =3D map;

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB=
-INF/jsp/admin/pollsList.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/j=
sp/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/j=
sp/admin/pollsList.jsp	2012-03-14 17:22:21 UTC (rev 3191)
@@ -24,7 +24,9 @@
 <%@page contentType=3D"text/html" pageEncoding=3D"UTF-8" %>
 <%@ taglib prefix=3D"s" uri=3D"/struts-tags" %>
 <%@ taglib prefix=3D"sjg" uri=3D"/struts-jquery-grid-tags" %>
-
+<script type=3D"text/javascript">
+  var redirectUrl =3D '<s:url namespace=3D"/admin" action=3D"pollsList"/>';
+</script>
 <%@include file=3D"/WEB-INF/jsp/pollListHelper.jsp"%>
=20
 <title><s:text name=3D"pollen.title.pollsList"/></title>


--===============2041349907542794914==--