Author: tchemit Date: 2012-03-06 00:39:29 +0100 (Tue, 06 Mar 2012) New Revision: 3162 Url: http://chorem.org/repositories/revision/pollen/3162 Log: fix urls Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:26:09 UTC (rev 3161) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:39:29 UTC (rev 3162) @@ -66,8 +66,9 @@ </action> <!-- edit poll --> - <action name="edit" + <action name="modification/*" class="org.chorem.pollen.ui.actions.poll.Edit"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/edit.jsp</result> <result>/WEB-INF/jsp/poll/resume.jsp</result> </action> @@ -88,29 +89,33 @@ </action> <!-- clone poll --> - <action name="clone" + <action name="clone/*" class="org.chorem.pollen.ui.actions.poll.Clone"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/clone.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> <!-- export poll --> - <action name="export" + <action name="export/*" class="org.chorem.pollen.ui.actions.poll.Export"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/export.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> <!-- close poll --> - <action name="close" + <action name="close/*" class="org.chorem.pollen.ui.actions.poll.Close"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/close.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> <!-- delete poll --> - <action name="delete" + <action name="delete/*" class="org.chorem.pollen.ui.actions.poll.Delete"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/delete.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-03-05 23:26:09 UTC (rev 3161) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-03-05 23:39:29 UTC (rev 3162) @@ -37,23 +37,23 @@ <s:url id='resultImg' value='/img/count.png'/> <s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="editUrl" action="edit" namespace="/poll" method="input"/> +<s:url id="editUrl" action="modification/" namespace="/poll" method="input"/> <s:url id='editImg' value='/img/edit.png'/> <s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> -<s:url id="closeUrl" action="close" namespace="/poll" method="input"/> +<s:url id="closeUrl" action="close/" namespace="/poll" method="input"/> <s:url id='closeImg' value='/img/close.png'/> <s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> -<s:url id="exportUrl" action="export" namespace="/poll" method="input"/> +<s:url id="exportUrl" action="export/" namespace="/poll" method="input"/> <s:url id='exportImg' value='/img/export.png'/> <s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> -<s:url id="cloneUrl" action="clone" namespace="/poll" method="input"/> +<s:url id="cloneUrl" action="clone/" namespace="/poll" method="input"/> <s:url id='cloneImg' value='/img/copy.png'/> <s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> -<s:url id="deleteUrl" action="delete" namespace="/poll" method="input"/> +<s:url id="deleteUrl" action="delete/" namespace="/poll" method="input"/> <s:url id='deleteImg' value='/img/delete.png'/> <s:set id='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> @@ -65,37 +65,34 @@ var result = ""; + if (rowObject['voteId']) { + id = rowObject['voteId']; + } + if (cellvalue.indexOf('vote') > -1) { - if (rowObject['voteId']) { - id = rowObject['voteId']; - } - result += formatLink(null, "${voteUrl}"+id, "${voteImg}", "Vote", "${voteTitle}") + result += formatLink("${voteUrl}" + id, "${voteImg}", "Vote", "${voteTitle}") } if (cellvalue.indexOf('result') > -1) { - result += formatLink(null, "${resultUrl}"+id, "${resultImg}", "Result", "${resultTitle}") + result += formatLink("${resultUrl}" + id, "${resultImg}", "Result", "${resultTitle}") } if (cellvalue.indexOf('edit') > -1) { - result += formatLink(id, "${editUrl}", "${editImg}", "Edit", "${editTitle}") + result += formatLink("${editUrl}" + id, "${editImg}", "Edit", "${editTitle}") } if (cellvalue.indexOf('close') > -1) { - result += formatLink(id, "${closeUrl}", "${closeImg}", "Close", "${closeTitle}") + result += formatLink("${closeUrl}" + id, "${closeImg}", "Close", "${closeTitle}") } if (cellvalue.indexOf('export') > -1) { - result += formatLink(id, "${exportUrl}", "${exportImg}", "Export", "${exportTitle}") + result += formatLink("${exportUrl}" + id, "${exportImg}", "Export", "${exportTitle}") } if (cellvalue.indexOf('clone') > -1) { - result += formatLink(id, "${cloneUrl}", "${cloneImg}", "Clone", "${cloneTitle}") + result += formatLink("${cloneUrl}" + id, "${cloneImg}", "Clone", "${cloneTitle}") } if (cellvalue.indexOf('delete') > -1) { - result += formatLink(id, "${deleteUrl}", "${deleteImg}", "Delete", "${deleteTitle}") + result += formatLink("${deleteUrl}" + id, "${deleteImg}", "Delete", "${deleteTitle}") } return result; } - function formatLink(id, baseUrl, image, imageAlt, imageTitle) { - var url = baseUrl; - if (id) { - url = $.prepareUrl(baseUrl, {pollId:id}); - } + function formatLink(url, image, imageAlt, imageTitle) { return "<a href='" + url + "'><image alt='" + imageAlt + "' title='" + imageTitle + "' src='" + image + "'> </a>"; } </script>