diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-08-25 11:19:30 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-08-25 11:19:30 +0530 |
| commit | b8cc16cc5dfb6faf0ddb1f65bc197b60c554cb07 (patch) | |
| tree | e97b6043d142b91d3a4447788f3710e163f0279c | |
| parent | c240ffc45eae179bdc988f5e46ae61197c4a0e77 (diff) | |
[IMP]Improved code in boot.js.
bzr revid: kch@tinyerp.com-20110825054930-z9p9zj276e6haj1l
| -rw-r--r-- | addons/base/controllers/main.py | 6 | ||||
| -rw-r--r-- | addons/base/static/src/js/boot.js | 5 | ||||
| -rw-r--r-- | addons/base/static/src/js/form.js | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index f04e59641f8..91819b1b173 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -168,14 +168,14 @@ class WebClient(openerpweb.Controller): "grouping", "decimal_point", "thousands_sep"]) else: lang_obj = None - + if lang.count("_") > 0: separator = "_" else: separator = "@" langs = lang.split(separator) langs = [separator.join(langs[:x]) for x in range(1, len(langs) + 1)] - + transs = {} for addon_name in mods: transl = {"messages":[]} @@ -1331,7 +1331,7 @@ class Import(View): records = [] fields = [] word='' - limit = 3 + limit = 4 try: for i, row in enumerate(data): records.append(row) diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js index dd451efb0c3..5ae30611195 100644 --- a/addons/base/static/src/js/boot.js +++ b/addons/base/static/src/js/boot.js @@ -54,15 +54,12 @@ openerp.base = function(instance) { openerp.base.formats(instance); openerp.base.chrome(instance); openerp.base.data(instance); - files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"]; + files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; for(i=0; i<files.length; i++) { if(openerp.base[files[i]]) { openerp.base[files[i]](instance); } } - if (openerp.base.data_import){ - openerp.base.data_import(instance); - } }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index e1db5761e1c..ce480b5d367 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -582,6 +582,7 @@ openerp.base.form.Widget = openerp.base.Widget.extend({ this.$element = $('#' + this.element_id); }, stop: function() { + this.$element = $('#' + this.element_id); this.$element.remove(); }, process_modifiers: function() { |