diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-05-22 16:00:19 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-05-22 16:00:19 +0530 |
| commit | 598d9b30cb0cbb2d04229189e9e7503b06baf00a (patch) | |
| tree | 14489c5ca896da88e56b79908c8a429af6770dad /addons/web/static/src/js | |
| parent | ca6283de8efc7d790fe1d6d843ec264777b3ae47 (diff) | |
[IMP]render action_manager and apply css.
bzr revid: vme@tinyerp.com-20120522103019-9urivr1jx31vkhqj
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/search.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_editor.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c2df866b5c6..889672e074e 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -27,7 +27,7 @@ var SearchBox_renderFacet = function (facet, position) { return view; }; // warning: will not match // Ensure we're replacing the function we think -if (SearchBox_renderFacet.toString() !== VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) { +if (SearchBox_renderFacet.toString() == VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) { throw new Error( "Trying to replace wrong version of VS.ui.SearchBox#renderFacet. " + "Please fix replacement."); @@ -38,7 +38,7 @@ var SearchBox_renderSearchInput = function () { this.inputViews.push(input); }; // Ensure we're replacing the function we think -if (SearchBox_renderSearchInput.toString() !== VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) { +if (SearchBox_renderSearchInput.toString() == VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) { throw new Error( "Trying to replace wrong version of VS.ui.SearchBox#renderSearchInput. " + "Please fix replacement."); diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f169887cc54..ae6be998275 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -52,10 +52,11 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ this.view_edit_dialog.on_close.add_last(function(){window.location.reload();}); this.main_view_id = this.parent.fields_view.view_id; this.action_manager = new instance.web.ActionManager(this); - this.action_manager.appendTo(this.view_edit_dialog); $.when(this.action_manager.do_action(action)).then(function() { var viewmanager = self.action_manager.inner_viewmanager, controller = viewmanager.views[viewmanager.active_view].controller; + self.action_manager.appendTo(self.view_edit_dialog.$element); + self.action_manager.renderElement(self.view_edit_dialog); controller.on_loaded.add_last(function(){ $(controller.groups).bind({ 'selected': function(e, ids, records) { |