Author: tchemit Date: 2012-02-23 13:31:32 +0100 (Thu, 23 Feb 2012) New Revision: 3144 Url: http://chorem.org/repositories/revision/pollen/3144 Log: make poll feeds works Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetFeed.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetFeed.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetFeed.java 2012-02-22 22:54:14 UTC (rev 3143) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetFeed.java 2012-02-23 12:31:32 UTC (rev 3144) @@ -48,18 +48,18 @@ protected long contentLength; - protected transient InputStream stream; + protected transient InputStream inputStream; - public String getPollId() { - return pollId; + public void setPollId(String pollId) { + this.pollId = pollId; } public long getContentLength() { return contentLength; } - public InputStream getStream() { - return stream; + public InputStream getInputStream() { + return inputStream; } @Override @@ -81,7 +81,7 @@ contentLength = feedLocation.length(); - stream = new FileInputStream(feedLocation); + inputStream = new FileInputStream(feedLocation); return SUCCESS; } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-02-22 22:54:14 UTC (rev 3143) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-02-23 12:31:32 UTC (rev 3144) @@ -84,7 +84,7 @@ </s:if> <t:FeedContextLink t:id="feedContext"/> <s:if test="feedFileExisting"> - <s:a namespace="/poll" action="getFeed" method="input"> + <s:a namespace="/poll" action="getFeed"> <s:param name="pollId" value="poll.pollId"/> <img src="<s:url value='/img/feed.png'/>" title="Atom" alt="Atom"/> </s:a>