Author: jleroux
Date: Wed May 19 09:56:38 2010
New Revision: 946098
URL: http://svn.apache.org/viewvc?rev=946098&view=rev
Log:
"Applied fix from trunk for revision: 946080"
------------------------------------------------------------------------
r946080 | jleroux | 2010-05-19 10:05:00 +0200 (mer. 19 mai 2010) | 3 lignes
This file was open in Eclipse and not saved for r946073/946075
(presentation="window")
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 09:56:38 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080
Modified:
ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml?rev=946098&r1=946097&r2=946098&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml
Wed May 19 09:56:38 2010
@@ -79,7 +79,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<field name="surveyId" map-name="survey"><hidden/></field>
<field name="contentId" map-name="empty"
title="${uiLabelMap.ContentPDF}">
- <lookup presentation="window" target-form-name="LookupContent"/>
+ <lookup target-form-name="LookupContent"/>
</field>
<field name="submitButton"
title="${uiLabelMap.ContentSurveyGenerateQuestions}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -91,7 +91,7 @@ under the License.
<field name="pdfFileNameIn" map-name="empty"><text/></field>
<field name="contentId" map-name="empty"
title="${uiLabelMap.ContentPDF}">
- <lookup presentation="window" target-form-name="LookupContent"/>
+ <lookup target-form-name="LookupContent"/>
</field>
<field name="submitButton"
title="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>