svn commit: r1788750 - in /ofbiz/ofbiz-plugins/trunk/birt: config/BirtUiLabels.xml widget/birt/BirtMasterForms.xml

Author: jleroux
Date: Sun Mar 26 16:47:07 2017
New Revision: 1788750

URL: http://svn.apache.org/viewvc?rev=1788750&view=rev
Log:
Improved: Improvement: warn users about sending a flexible report before having
published it
(OFBIZ-9284)

When you create a Flexible Report you get to the EditFlexibleReport screen.
There is a Preview panel with a Send button. If you send before having
1) downloaded the file,
2) conveniently edited it in Birt Report Designer
3)  and then uploaded it,
you get an error which is embarrassing and difficult to avoid
programmatically.

I decided to warn users, when necessary (ie when the report is not published)
at the UI level. This completes OFBIZ-9194


Modified:
    ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml
    ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtMasterForms.xml

Modified: ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml?rev=1788750&r1=1788749&r2=1788750&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml Sun Mar 26 16:47:07 2017
@@ -286,4 +286,9 @@
         <value xml:lang="en">Generate filters in design</value>
         <value xml:lang="fr">Générer les filtres dans le design</value>
     </property>
+    <property key="SendWarning">
+        <value xml:lang="en">Only when you have edited the report in the Birt Report Designer and then uploaded.</value>
+        <value xml:lang="fr">Seulement après avoir éditer le rapport avec le Birt Report Designer puis télécharger vers le serveur.</value>
+    </property>
+    
 </resource>

Modified: ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtMasterForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtMasterForms.xml?rev=1788750&r1=1788749&r2=1788750&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtMasterForms.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtMasterForms.xml Sun Mar 26 16:47:07 2017
@@ -50,7 +50,8 @@ under the License.
         <field name="rptDesignFile"><hidden/></field>
         <field name="birtOutputFileName"><hidden value="${content.contentName}"/></field>
         <field name="modelElementName"><hidden value="${contentAttrs[0].attrValue}"/></field>
-        <field name="sendButton"><submit/></field>
+        <field name="sendButton" tooltip="${uiLabelMap.SendWarning}" use-when="&quot;CTNT_IN_PROGRESS&quot;.equals(&quot;${content.statusId}&quot;)"><submit/></field>
+        <field name="sendButton" use-when="!&quot;CTNT_IN_PROGRESS&quot;.equals(&quot;${content.statusId}&quot;)"><submit/></field>
         <sort-order>
             <last-field name="birtContentType"/>
             <last-field name="sendButton"/>