svn commit: r1706549 - in /ofbiz/trunk/applications/content/webapp/content: WEB-INF/actions/survey/EditSurveyResponse.groovy survey/EditSurveyResponse.ftl

[Deepak Dixit-5]

Author: deepak
Date: Sat Oct  3 11:35:52 2015
New Revision: 1706549

URL: http://svn.apache.org/viewvc?rev=1706549&view=rev
Log:
(OFBIZ-6584) Display submitter partyId on edit response screen. Now if submitter partyId exists then display the same else logged-in partyId will be displayed.

Modified:
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy
    ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy?rev=1706549&r1=1706548&r2=1706549&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy Sat Oct  3 11:35:52 2015
@@ -25,11 +25,10 @@ partyId = null;
 
 if (!surveyId && surveyResponseId) {
    surveyResponse = from("SurveyResponse").where("surveyResponseId", surveyResponseId).queryOne();
-  
    surveyId = surveyResponse.surveyId;
+   context.surveyPartyId = surveyResponse.partyId;
    context.surveyId = surveyId;
 }
-
 surveyWrapper = new SurveyWrapper(delegator, surveyResponseId, partyId, surveyId, null);
 surveyWrapper.setEdit(true);
 

Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl?rev=1706549&r1=1706548&r2=1706549&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl Sat Oct  3 11:35:52 2015
@@ -20,7 +20,7 @@ under the License.
 <#-- Render the survey -->
 <#if surveyString?has_content>
   <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>updateSurveyResponse</@ofbizUrl>" name="EditSurveyResponseForm" style="margin: 0;">
-    <div>${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
+    <div>${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${surveyPartyId!(userLogin.partyId!)}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
     <#-- pass through the dataResourceId so the response can be associated with it -->
     <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId!}"/>
     <input type="hidden" name="rootContentId" value="${parameters.rootContentId!}"/>