svn commit: r770678 - in /ofbiz/branches/release09.04: ./ framework/common/widget/PortalPageForms.xml mergefromtrunk.bat

Author: jleroux
Date: Fri May  1 13:39:01 2009
New Revision: 770678

URL: http://svn.apache.org/viewvc?rev=770678&view=rev
Log:
"Applied fix from trunk for revision: 770272"
------------------------------------------------------------------------
r770272 | hansbak | 2009-04-30 17:06:04 +0200 (jeu., 30 avr. 2009) | 1 line

OFBIZ-2393: portlet list not displayed
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/common/widget/PortalPageForms.xml
    ofbiz/branches/release09.04/mergefromtrunk.bat

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  1 13:39:01 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
+/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

Modified: ofbiz/branches/release09.04/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/widget/PortalPageForms.xml?rev=770678&r1=770677&r2=770678&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/branches/release09.04/framework/common/widget/PortalPageForms.xml Fri May  1 13:39:01 2009
@@ -113,7 +113,7 @@
                 <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
             </hyperlink>
         </field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" field-name="description"><display/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
     </form>
 
 </forms>

Modified: ofbiz/branches/release09.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.bat?rev=770678&r1=770677&r2=770678&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.bat Fri May  1 13:39:01 2009
@@ -6,10 +6,10 @@
 svn up
 set /p version=version to merge :
 set /a prevRev=%version% - 1
-svn log -r %version% > log.tmp
-set /p log = < log.tmp
+echo "Applied fix from trunk for revision: %version%" > comment.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+copy comment.tmp + log.tmp = comment.tmp
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
-svn commit -m "Applied fix from trunk for revision: %version% \n %log%"
+svn commit -F comment.tmp
 pause
-del log.tmp