svn commit: r1036329 - in /ofbiz/trunk: applications/content/script/org/ofbiz/content/blog/ applications/content/widget/forum/ specialpurpose/ecommerce/widget/blog/

[hansbak-2]

Author: hansbak
Date: Thu Nov 18 06:29:25 2010
New Revision: 1036329

URL: http://svn.apache.org/viewvc?rev=1036329&view=rev
Log:
blog summary could not be updated, in the same process move the editarticle form from ecommerce to content because also used there.

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
    ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
    ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=1036329&r1=1036328&r2=1036329&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Thu Nov 18 06:29:25 2010
@@ -129,6 +129,7 @@
                 <or>
                     <if-compare-field field="parameters.contentName" operator="not-equals" to-field="contentName"/>
                     <if-compare-field field="parameters.description" operator="not-equals" to-field="description"/>
+                    <if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData"/>
                     <if-compare-field field="parameters.templateDataResourceId" operator="not-equals" to-field="templateDataResourceId"/>
                     <if-compare-field field="parameters.statusId" operator="not-equals" to-field="statusId"/>
                 </or>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1036329&r1=1036328&r2=1036329&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Thu Nov 18 06:29:25 2010
@@ -63,5 +63,30 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
 
+    <form name="EditArticle" target="createBlogArticle" title="" type="upload" skip-end="true" default-map-name="blogEntry"
+        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <alt-target use-when="contentId!=void&amp;&amp;contentId!=null" target="updateBlogArticle"/>
+        <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field>
+        <field name="contentId" title="${uiLabelMap.EcommerceBlogEntryId}" use-when="contentId!=void&amp;&amp;contentId!=null"><display/></field>
+        <field name="contentName" title="${uiLabelMap.EcommerceArticleName}"><text size="40"/></field>
+        <field name="description"><textarea cols="60" rows="2"/></field>
+        <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
+        <field name="articleData" title="${uiLabelMap.EcommerceBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="100" rows="20" visual-editor-enable="true"/></field>
+        <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field>
+        <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}">
+            <drop-down>
+                <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.EcommerceBlogTopLeft}"/>
+                <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/>
+            </drop-down>
+        </field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
+                <option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
 
 </forms>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml?rev=1036329&r1=1036328&r2=1036329&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml Thu Nov 18 06:29:25 2010
@@ -202,7 +202,7 @@ under the License.
                         <decorator-screen name="blogArtDecorator">
                             <decorator-section name="body">
                                 <sub-content content-id="${contentId}" map-key="IMAGE"/>
-                                <include-form name="EditArticle" location="component://ecommerce/widget/blog/BlogForms.xml"/>
+                                <include-form name="EditArticle" location="component://content/widget/forum/BlogForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1036329&r1=1036328&r2=1036329&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Thu Nov 18 06:29:25 2010
@@ -196,31 +196,6 @@
         </sort-order>
     </form>
 
-    <form name="EditArticle" target="createBlogArticle" title="" type="upload" skip-end="true" default-map-name="blogEntry"
-        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <alt-target use-when="contentId!=void&amp;&amp;contentId!=null" target="updateBlogArticle"/>
-        <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field>
-        <field name="contentId" title="${uiLabelMap.EcommerceBlogEntryId}" use-when="contentId!=void&amp;&amp;contentId!=null"><display/></field>
-        <field name="contentName" title="${uiLabelMap.EcommerceArticleName}"><text size="40"/></field>
-        <field name="description"><textarea cols="60" rows="2"/></field>
-        <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
-        <field name="articleData" title="${uiLabelMap.EcommerceBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="100" rows="20" visual-editor-enable="true"/></field>
-        <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field>
-        <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}">
-            <drop-down>
-                <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.EcommerceBlogTopLeft}"/>
-                <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/>
-            </drop-down>
-        </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
-                <option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/>
-                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
-            </drop-down>
-        </field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-
     <form name="editFormSubmit" target="" title="" type="single" skip-start="true" skip-end="true"
         default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=1036329&r1=1036328&r2=1036329&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Thu Nov 18 06:29:25 2010
@@ -176,7 +176,7 @@
                     <widgets>
                         <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}">
                             <decorator-section name="body">
-                                <include-form name="EditArticle" location="component://ecommerce/widget/blog/BlogForms.xml"/>
+                                <include-form name="EditArticle" location="component://content/widget/forum/BlogForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </widgets>
@@ -209,7 +209,7 @@
                         <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}">
                             <decorator-section name="body">
                                 <sub-content content-id="${parameters.contentId}" map-key="IMAGE"/>
-                                <include-form name="EditArticle" location="component://ecommerce/widget/blog/BlogForms.xml"/>
+                                <include-form name="EditArticle" location="component://content/widget/forum/BlogForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </widgets>