diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-05-22 17:50:01 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-05-22 17:50:01 +0530 |
| commit | d89a2335e8a22baf132ecbd01fbf19faa3bc4f5e (patch) | |
| tree | 5e120d4011319c8db321b342515461edf43a5343 /addons/web/static/src/js | |
| parent | 598d9b30cb0cbb2d04229189e9e7503b06baf00a (diff) | |
[REV]revert last commit.
bzr revid: vme@tinyerp.com-20120522122001-01297nqy4uq3xe7b
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, 3 insertions, 4 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 889672e074e..c2df866b5c6 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 ae6be998275..f169887cc54 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -52,11 +52,10 @@ 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) { |