Merge branch 'master' into 'production'

Release 0.9.4

* Add some missing case in `Dbui.grid.Filter.setTrigger`

See merge request !32

VERSION

-0.9.3.1
\ No newline at end of file
+0.9.4
\ No newline at end of file

configure_build.py

@@ -162,11 +162,9 @@ def get_plugin_version(plugin):
 
     elif plugin == "dbui":
 
-        with open(DBUIJS, "rb") as tmpfile:
-            text = tmpfile.read()
-
-        match = re.match(r"(.+    version: ')([\w._-]*)('.+)", text, re.DOTALL)
-        release = match.group(2)
+        with open(VERSION, "rb") as tmpfile:
+            release = tmpfile.read()
+            release = release.replace(".", "")
 
     elif plugin == "extjs":
 
@@ -185,6 +183,10 @@ def get_plugin_version(plugin):
 
         release = match.group(1)
 
+        # shrink the release identifier 4.2.1 or 4.2.1.883 -> 421
+        li = release.split('.')
+        release = ''.join(li) if len(li) < 4 else ''.join(li[:-1])
+
     elif plugin == "mathjax":
 
         filename = os.path.join('static', 'plugin_mathjax', 'MathJax.js')
@@ -203,10 +205,6 @@ def get_plugin_version(plugin):
         error("\n\tUnknown plugin %" % plugin)
         sys.exit(1)
 
-    # shrink the release identifier 4.2.1 or 4.2.1.883 -> 421
-    li = release.split('.')
-    release = ''.join(li) if len(li) < 4 else ''.join(li[:-1])
-
     if len(release) == 2:
         release = "%s0" % release
 

static/plugin_dbui/CHANGELOG

@@ -2,12 +2,12 @@
 
 HEAD
 
-0.9.3.1 (Oct 2016)
+0.9.4 (Oct 2016)
    - Fix AceEditor class in order to run with Ext JS 6
    - Remove the JavaScript class DictMultiDefault.
    - Redesign the Dbui.grid.Filter class to work with any kind of layout.
    - Add the widget Dbui.form.field.Table.
-   - Add the event 'change' to List and Dict widgets.
+   - Add the event 'change' to Dbui.form.field.List and Dict widgets.
 
 0.9.2 (Sep 2016)
    - Add the base class Dbui.grid.plugin.ContextMenu

static/plugin_dbui/src/Dbui.js

@@ -15,7 +15,7 @@ Ext.define('Dbui', {
      * The version of the plugin
      * @property {String}
      */
-    version: '0.9.3.1',
+    version: '0.9.4',
 
     /**
      * The name of the application

static/plugin_dbui/src/grid/Filter.js

@@ -359,21 +359,12 @@ Ext.define('Dbui.grid.Filter', {
 
             switch (field.xtype) {
             case "datefield":
-                field.on({
-                    change: me.onChange,
-                    select: me.onChange,
-                    scope: me
-                });
-                break;
-
-            case "xdictfield":
-                field.on({
-                    change: me.onChange,
-                    keychange: me.onChange,
-                    scope: me
+                field.on('change', me.onChange, me, {
+                    buffer: 1000
                 });
                 break;
 
+            case "numberfield":
             case "textfield":
             case "textarea":
             case "textareafield":
@@ -382,6 +373,14 @@ Ext.define('Dbui.grid.Filter', {
                 });
                 break;
 
+            case "xdictfield":
+                field.on({
+                    change: me.onChange,
+                    keychange: me.onChange,
+                    scope: me
+                });
+                break;
+
             default:
                 field.on('change', me.onChange, me);
             }