diff --git a/VERSION b/VERSION index 1404893891dadd885f7ccace44586d926b356e1d..2bd77c74f1066f239ee36380320771fa1fe6d1be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.3.1 \ No newline at end of file +0.9.4 \ No newline at end of file diff --git a/configure_build.py b/configure_build.py index 1352872b1138eda4fd2e198c994add574f2bc842..7d456ce63154f925a17951a315ec37485fb05c65 100644 --- a/configure_build.py +++ b/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 diff --git a/static/plugin_dbui/CHANGELOG b/static/plugin_dbui/CHANGELOG index feb795af0c7f0f52ee6b87296cfddb64f3a70c9d..efe0c809fda72036a84d4d7741fef07563780788 100644 --- a/static/plugin_dbui/CHANGELOG +++ b/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 diff --git a/static/plugin_dbui/src/Dbui.js b/static/plugin_dbui/src/Dbui.js index 3a4f8b5b2263dbec10666efbb95659775c7b60d7..2c9f165f0ae44b703bab4af3516c04172e8b87cf 100644 --- a/static/plugin_dbui/src/Dbui.js +++ b/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 diff --git a/static/plugin_dbui/src/grid/Filter.js b/static/plugin_dbui/src/grid/Filter.js index f58d768510a95b6b41db9664e83b4f22254b2c99..a6a47bbc696960fa439bf18e341b76f06d4e4913 100644 --- a/static/plugin_dbui/src/grid/Filter.js +++ b/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); }