OFBiz › OFBiz - Commits

svn commit: r1036332 - in /ofbiz/trunk: applications/content/config/ applications/content/script/org/ofbiz/content/blog/ applications/content/widget/forum/ specialpurpose/ecommerce/config/ specialpurpose/ecommerce/webapp/ecommerce/forum/ specialpurpose...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
hansbak-2
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1036332 - in /ofbiz/trunk: applications/content/config/ applications/content/script/org/ofbiz/content/blog/ applications/content/widget/forum/ specialpurpose/ecommerce/config/ specialpurpose/ecommerce/webapp/ecommerce/forum/ specialpurpose...

hansbak-2
Author: hansbak
Date: Thu Nov 18 07:28:45 2010
New Revision: 1036332

URL: http://svn.apache.org/viewvc?rev=1036332&view=rev
Log:
replacing an empty blog summary with text did not work and moving labels from ecommerce to content because used in both components

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
    ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl
    ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=1036332&r1=1036331&r2=1036332&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Nov 18 07:28:45 2010
@@ -78,6 +78,10 @@
         <value xml:lang="th">ความคิดเห็น</value>
         <value xml:lang="zh">关联</value>
     </property>
+    <property key="ContentArticleName">
+        <value xml:lang="en">Article Name</value>
+        <value xml:lang="th">ชื่อบทความ</value>
+    </property>
     <property key="ContentAttribute">
         <value xml:lang="ar">خاصية</value>
         <value xml:lang="da">Attribut</value>
@@ -112,7 +116,8 @@
         <value xml:lang="en">Article</value>
         <value xml:lang="fr">Article</value>
         <value xml:lang="it">Articolo</value>
-        <value xml:lang="nl">Artikel</value>
+        <value xml:lang="nl">Artikel</value>        
+        <value xml:lang="pt_BR">Artigo</value>
         <value xml:lang="zh">文章</value>
     </property>
     <property key="ContentBlogArticleList">
@@ -131,6 +136,15 @@
         <value xml:lang="nl">Beschrijving blog</value>
         <value xml:lang="zh">博客描述</value>
     </property>
+    <property key="ContentBlogEntryId">
+        <value xml:lang="da">Blog indlæg id</value>
+        <value xml:lang="en">Blog entry Id</value>
+        <value xml:lang="fr">Réf. de note de blog</value>
+        <value xml:lang="it">Voce blog</value>
+        <value xml:lang="nl">Blog ingave ID</value>    
+        <value xml:lang="pt_BR">ID de entrada de blog</value>
+        <value xml:lang="zh">博客记录标识</value>
+    </property>
     <property key="ContentBlogEdit">
         <value xml:lang="da">Redigér en blog</value>
         <value xml:lang="en">Edit a Blog</value>
@@ -1435,6 +1449,22 @@
         <value xml:lang="th">Sites ย่อย</value>
         <value xml:lang="zh">子站点</value>
     </property>
+    <property key="ContentSummary">
+        <value xml:lang="da">Resumé</value>
+        <value xml:lang="de">Zusammenfassung</value>
+        <value xml:lang="en">Summary</value>
+        <value xml:lang="es">Resumen</value>
+        <value xml:lang="fr">Résumé</value>
+        <value xml:lang="hi_IN">साराशं</value>
+        <value xml:lang="it">Sommario</value>
+        <value xml:lang="ja">Summary</value>
+        <value xml:lang="nl">Samenvatting</value>
+        <value xml:lang="pt_BR">Resumo</value>
+        <value xml:lang="ro">Breviar</value>
+        <value xml:lang="ru">Итоги</value>
+        <value xml:lang="th">สรุป</value>
+        <value xml:lang="zh">摘要</value>
+    </property>
     <property key="ContentSurveryCategory">
         <value xml:lang="ar">فئة</value>
         <value xml:lang="da">Kategori</value>

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=1036332&r1=1036331&r2=1036332&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 07:28:45 2010
@@ -175,8 +175,31 @@
             </if-compare-field>
         </if-not-empty>
 
+        <!-- create summary text -->
+        <if-empty field="summaryData">
+            <if-not-empty field="parameters.summaryData">
+                <!-- create the summary data -->
+                <set field="ownerContentId" from-field="parameters.blogContentId"/>
+                <set field="contentAssocTypeId" value="SUB_CONTENT"/>
+                <set field="contentIdFrom" from-field="contentId"/>
+                <set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
+                <set field="createSummary.contentPurposeTypeId" value="ARTICLE"/>
+                <set field="createSummary.dataTemplateTypeId" value="NONE"/>
+                <set field="createSummary.mapKey" value="SUMMARY"/>
+                <set field="createSummary.ownerContentId" from-field="ownerContentId"/>
+                <set field="createSummary.contentName" from-field="parameters.contentName"/>
+                <set field="createSummary.description" from-field="parameters.description"/>
+                <set field="createSummary.statusId" from-field="parameters.statusId"/>
+                <set field="createSummary.contentAssocTypeId"  from-field="contentAssocTypeId"/>
+                <set field="createSummary.textData" from-field="parameters.summaryData"/>
+                <set field="createSummary.contentIdFrom" from-field="contentIdFrom"/>
+                <set field="createSummary.partyId" from-field="userLogin.partyId"/>
+                <call-service service-name="createTextContent" in-map-name="createSummary"/>
+            </if-not-empty>
+        </if-empty>
+
         <!-- update summary text -->
-        <if-not-empty field="summaryText">
+        <if-not-empty field="summaryData">
             <if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData">
                 <set field="summaryText.textData" from-field="parameters.summaryData"/>
                 <store-value value-field="summaryText"/>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1036332&r1=1036331&r2=1036332&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Thu Nov 18 07:28:45 2010
@@ -67,11 +67,11 @@ under the License.
         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="contentId" title="${uiLabelMap.ContentBlogEntryId}" use-when="contentId!=void&amp;&amp;contentId!=null"><display/></field>
+        <field name="contentName" title="${uiLabelMap.ContentArticleName}"><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="summaryData" title="${uiLabelMap.ContentSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
+        <field name="articleData" title="${uiLabelMap.ContentBlogArticle}" 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>

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1036332&r1=1036331&r2=1036332&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Thu Nov 18 07:28:45 2010
@@ -263,10 +263,6 @@
         <value xml:lang="th">ข้อมูลบทความ</value>
         <value xml:lang="zh">文章信息</value>
     </property>
-    <property key="EcommerceArticleName">
-        <value xml:lang="en">Article Name</value>
-        <value xml:lang="th">ชื่อบทความ</value>
-    </property>
     <property key="EcommerceAvailable">
         <value xml:lang="en">Available:</value>
         <value xml:lang="fr">Disponible :</value>
@@ -331,15 +327,6 @@
         <value xml:lang="pt_BR">Adicionar um tópico de discussão</value>
         <value xml:lang="zh">添加一个线索：</value>
     </property>
-    <property key="EcommerceBlogArticle">
-        <value xml:lang="da">Artikel</value>
-        <value xml:lang="en">Article</value>
-        <value xml:lang="fr">Article</value>
-        <value xml:lang="it">Articolo</value>
-        <value xml:lang="nl">Artikel</value>        
-        <value xml:lang="pt_BR">Artigo</value>
-        <value xml:lang="zh">文章</value>
-    </property>
     <property key="EcommerceBlogContentNotFound">
         <value xml:lang="da">Kan ikke finde blog indhold!</value>
         <value xml:lang="en">Unable to find Blog content!</value>
@@ -358,15 +345,6 @@
         <value xml:lang="pt_BR">Você deve registrar-se para editar comentários</value>
         <value xml:lang="zh">你必须登录以便编辑评论。</value>
     </property>
-    <property key="EcommerceBlogEntryId">
-        <value xml:lang="da">Blog indlæg id</value>
-        <value xml:lang="en">Blog entry Id</value>
-        <value xml:lang="fr">Réf. de note de blog</value>
-        <value xml:lang="it">Voce blog</value>
-        <value xml:lang="nl">Blog ingave ID</value>    
-        <value xml:lang="pt_BR">ID de entrada de blog</value>
-        <value xml:lang="zh">博客记录标识</value>
-    </property>
     <property key="EcommerceBlogFullMessage">
         <value xml:lang="da">Fuld besked</value>
         <value xml:lang="en">Full message</value>
@@ -3141,22 +3119,6 @@
         <value xml:lang="pt_BR">E-mail de verificação de inscrição</value>
         <value xml:lang="zh">订阅验证电子邮件</value>
     </property>
-    <property key="EcommerceSummary">
-        <value xml:lang="da">Resumé</value>
-        <value xml:lang="de">Zusammenfassung</value>
-        <value xml:lang="en">Summary</value>
-        <value xml:lang="es">Resumen</value>
-        <value xml:lang="fr">Résumé</value>
-        <value xml:lang="hi_IN">साराशं</value>
-        <value xml:lang="it">Sommario</value>
-        <value xml:lang="ja">Summary</value>
-        <value xml:lang="nl">Samenvatting</value>
-        <value xml:lang="pt_BR">Resumo</value>
-        <value xml:lang="ro">Breviar</value>
-        <value xml:lang="ru">Итоги</value>
-        <value xml:lang="th">สรุป</value>
-        <value xml:lang="zh">摘要</value>
-    </property>
     <property key="EcommerceSummaryInformation">
         <value xml:lang="da">Resumé information</value>
         <value xml:lang="de">Zusammenfassung Information</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=1036332&r1=1036331&r2=1036332&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Thu Nov 18 07:28:45 2010
@@ -72,7 +72,7 @@ under the License.
         <h3>${uiLabelMap.EcommerceSummaryInformation}</h3>
     <div class="screenlet-body">
   <table>
-    <tr><td><div class='tabletext'>${uiLabelMap.EcommerceSummary}</div></td><td>&nbsp;</td><td><div class='tabletext'>
+    <tr><td><div class='tabletext'>${uiLabelMap.ContentSummary}</div></td><td>&nbsp;</td><td><div class='tabletext'>
 ${summaryData?if_exists}
 <div></td></tr>
   </table>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1036332&r1=1036331&r2=1036332&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Thu Nov 18 07:28:45 2010
@@ -65,7 +65,7 @@ under the License.
         <field name="description">
             <text size="60"/>
         </field>
-       <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+       <field name="summaryData" title="${uiLabelMap.ContentSummary}"
             use-when="&quot;${summaryDataResourceTypeId}&quot;.length()>0"
             id-name="summaryData">
                 <textarea rows="8" cols="80"/>
@@ -247,7 +247,7 @@ under the License.
         <field name="description">
             <text size="60"/>
         </field>
-       <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+       <field name="summaryData" title="${uiLabelMap.ContentSummary}"
             use-when="&quot;${summaryDataResourceTypeId}&quot;.length()>0"
             id-name="summaryData">
                 <textarea rows="8" cols="80"/>
@@ -473,7 +473,7 @@ under the License.
         <field name="description" title="${uiLabelMap.EcommerceLongSubject}">
             <text size="60"/>
         </field>
-       <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+       <field name="summaryData" title="${uiLabelMap.ContentSummary}"
             use-when="&quot;${summaryDataResourceTypeId}&quot;.length()>0"
             id-name="summaryData">
                 <textarea rows="8" cols="80"/>


Free forum by Nabble Edit this page