CI: merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 18 Sep 2014 22:18:13 +0000
changeset 24450 8854431e7ea2
parent 24449 caec3903b0e2 (diff)
parent 24446 fd85fc030a49 (current diff)
child 24451 c6301654f7cf
CI: merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Thu Sep 18 22:00:51 2014 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Thu Sep 18 22:18:13 2014 +0000
@@ -442,6 +442,8 @@
   },
 
   dataArrived: function (startRow, endRow) {
+	// reset noDataEmptyMessage to prevent showing "loading..." indefinitely if the datasource does not return any data
+    this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_NoDataInGrid') + '</span>';
     this.resetEmptyMessage();
     if (this.actionAfterDataArrived) {
       this.actionAfterDataArrived();
--- a/modules/org.openbravo.client.kernel/jslint/jscheck-module-hg	Thu Sep 18 22:00:51 2014 +0000
+++ b/modules/org.openbravo.client.kernel/jslint/jscheck-module-hg	Thu Sep 18 22:18:13 2014 +0000
@@ -4,8 +4,14 @@
 echo "Performing jslint check on modified js resources"
 for i in $(hg log -r $HG_NODE --template '{files}')
 do
-  if [ -f "$i" -a -n "$(echo $i | awk '/.js$/')" ]; then
-    ../org.openbravo.client.kernel/jslint/jslint-module $i || exit 1
+	if [[ $i == *enyo* ]]
+	then
+	  echo "Skipping " $i;
+	else
+	  if [ -f "$i" -a -n "$(echo $i | awk '/.js$/')" ]
+	  then
+	    ../org.openbravo.client.kernel/jslint/jslint-module $i || exit 1
+		fi
   fi
 done
 
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Thu Sep 18 22:00:51 2014 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Thu Sep 18 22:18:13 2014 +0000
@@ -391,12 +391,12 @@
       // See issue https://issues.openbravo.com/view.php?id=22971
       return "";
     }
+    if (value instanceof Timestamp) {
+      return xmlDateTimeFormat.format(value);
+    }
     if (value instanceof Date) {
       return xmlDateFormat.format(value);
     }
-    if (value instanceof Timestamp) {
-      return xmlDateTimeFormat.format(value);
-    }
     return value;
   }
 
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 18 22:00:51 2014 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 18 22:18:13 2014 +0000
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>