svn commit: r821264 - in /ofbiz/branches/release09.04: ./ applications/content/webapp/content/survey/EditSurveyQuestions.ftl

Author: jleroux
Date: Sat Oct  3 07:51:08 2009
New Revision: 821264

URL: http://svn.apache.org/viewvc?rev=821264&view=rev
Log:
"Applied fix from trunk for revision: 821263  "
------------------------------------------------------------------------
r821263 | jleroux | 2009-10-03 09:48:11 +0200 (sam. 03 oct. 2009) | 3 lignes

A patch from Rohit Jain "In ?Content Manager component? Remove Survey question link of Edit survey question page is showing error." (https://issues.apache.org/jira/browse/OFBIZ-2993) - OFBIZ-2993

Part of Main task for securing URLs in Freemarker templates files  (OFBIZ-2330)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct  3 07:51:08 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263

Modified: ofbiz/branches/release09.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=821264&r1=821263&r2=821264&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/branches/release09.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Sat Oct  3 07:51:08 2009
@@ -53,11 +53,12 @@
           <#else/>
             <#assign currentSurveyMultiRespColumns = []/>
           </#if>
-          <form method="post" action="<@ofbizUrl>updateSurveyQuestionAppl</@ofbizUrl>">
-            <input type="hidden" name="surveyId" value="${surveyQuestionAndAppl.surveyId}">
-            <input type="hidden" name="surveyQuestionId" value="${surveyQuestionAndAppl.surveyQuestionId}">
-            <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}">
+          
             <tr<#if alt_row> class="alternate-row"</#if>>
+            <form method="post" action="<@ofbizUrl>updateSurveyQuestionAppl</@ofbizUrl>">
+              <input type="hidden" name="surveyId" value="${surveyQuestionAndAppl.surveyId}" />
+              <input type="hidden" name="surveyQuestionId" value="${surveyQuestionAndAppl.surveyQuestionId}" />
+              <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}" />
               <td>${surveyQuestionAndAppl.surveyQuestionId}</td>
               <td>${questionType.get("description",locale)}</td>
               <td>${(questionCat.description)?if_exists}</td>
@@ -116,9 +117,16 @@
               <td><input type="text" name="withSurveyOptionSeqId" size="5" value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td>
               <td><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
               <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.ContentSurveyQuestion}</a></td>
-              <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${surveyQuestionAndAppl.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}&fromDate=${surveyQuestionAndAppl.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
+              </form>
+              <td>
+                <form id="removeSurveyQuestion_${surveyQuestionAndAppl.surveyQuestionId}" action="<@ofbizUrl>removeSurveyQuestionAppl</@ofbizUrl>" method="post">
+                  <input type="hidden" name="surveyId" value="${surveyQuestionAndAppl.surveyId}" />
+                  <input type="hidden" name="surveyQuestionId" value="${surveyQuestionAndAppl.surveyQuestionId}" />
+                  <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}" />
+                  <a href="javascript:$('removeSurveyQuestion_${surveyQuestionAndAppl.surveyQuestionId}').submit();"" class="buttontext">${uiLabelMap.CommonRemove}</a>
+                </form>
+              </td>
             </tr>
-          </form>
           <#assign alt_row = !alt_row>
         </#list>
       </table>