From 63702d6064d6dd457ccd82aa56ac44d375fe001c Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 14 Aug 2012 14:20:41 +0530 Subject: [PATCH 1/4] [IMP]minor fix to view editor. bzr revid: vme@tinyerp.com-20120814085041-s0lkqzcnyks0ukdn --- addons/web_view_editor/static/src/css/view_editor.css | 4 ++++ addons/web_view_editor/static/src/js/view_editor.js | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css index e80e15a4c17..2f2b5860cf6 100644 --- a/addons/web_view_editor/static/src/css/view_editor.css +++ b/addons/web_view_editor/static/src/css/view_editor.css @@ -19,3 +19,7 @@ .openerp .oe_view_editor tr:hover { background-color: #ecebf2; } +.openerp .oe_view_editor_field a{ + font-size : 12px; + color : #404040; +} \ No newline at end of file diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index cfdd5d6bfea..770d32b2e56 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -73,8 +73,7 @@ instance.web_view_editor.ViewEditor = instance.web.OldWidget.extend({ $.when(this.action_manager.do_action(action)).then(function() { var viewmanager = self.action_manager.inner_widget, controller = viewmanager.views[viewmanager.active_view].controller; - self.action_manager.appendTo(self.view_edit_dialog.$element); - self.action_manager.renderElement(self.view_edit_dialog); + self.action_manager.$element.appendTo(self.view_edit_dialog.$element); controller.on_loaded.add_last(function(){ $(controller.groups).bind({ 'selected': function(e, ids, records) { From 8152ff96099f4ef8d641f4460fdd93bfa1641261 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 1 Nov 2012 12:02:20 +0530 Subject: [PATCH 2/4] [IMP]Css cleanup and refactore code. bzr revid: vme@tinyerp.com-20121101063220-jlppjre8vefpeezv --- .../static/src/css/view_editor.css | 14 ++------------ .../web_view_editor/static/src/js/view_editor.js | 16 ++-------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css index 2f2b5860cf6..e48bf344629 100644 --- a/addons/web_view_editor/static/src/css/view_editor.css +++ b/addons/web_view_editor/static/src/css/view_editor.css @@ -1,25 +1,15 @@ .openerp .oe_view_editor { width: 100%; - border-collapse: collapse; margin-left: -12px; - width: 100%; - background-color: white; - border-spacing: 0; } .openerp .oe_view_editor td { - text-align: center; - white-space: nowrap; border: 1px solid #d8d8d8; cursor: pointer; - font-size: 90%; } -.openerp .oe_view_editor_field td { +.openerp .oe_view_editor td *{ border: 0px !important; + color : #404040; } .openerp .oe_view_editor tr:hover { background-color: #ecebf2; } -.openerp .oe_view_editor_field a{ - font-size : 12px; - color : #404040; -} \ No newline at end of file diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index dadf34b1247..e0a0df5ab53 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -18,11 +18,10 @@ instance.web.ViewManagerAction.include({ return this._super.apply(this,arguments); } } -}) +}); instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); - this.element_id = element_id; this.parent = parent; this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null), this.model = dataset.model; @@ -71,18 +70,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ 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.$el); - $.when(this.action_manager.do_action(action)).then(function() { - - var viewmanager = self.action_manager.inner_widget; - var controller = viewmanager.views[viewmanager.active_view].controller; - controller.on('view_loaded', function(){ - $(controller.groups).bind({ - 'selected': function(e, ids, records) { - self.main_view_id = ids[0]; - } - }) - }); - }); + this.action_manager.do_action(action); }, on_create_view: function() { var self = this; From a5aa575356f21815780efe41a7454de3b2382f92 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 1 Nov 2012 12:34:18 +0530 Subject: [PATCH 3/4] [FIX] bzr revid: vme@tinyerp.com-20121101070418-guunfniuhvgy8ot9 --- addons/web_view_editor/static/src/js/view_editor.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index e0a0df5ab53..354feaeb28d 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -70,7 +70,17 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ 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.$el); - this.action_manager.do_action(action); + $.when(this.action_manager.do_action(action)).then(function() { + var viewmanager = self.action_manager.inner_widget; + var controller = viewmanager.views[viewmanager.active_view].controller; + controller.on('view_loaded', self, function(){ + $(controller.groups).bind({ + 'selected': function(e, ids, records) { + self.main_view_id = ids[0]; + } + }); + }); + }); }, on_create_view: function() { var self = this; From 011c9ca6c7bff235e0ea5b1637d940c74a9835c1 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 1 Nov 2012 12:38:28 +0530 Subject: [PATCH 4/4] [imp]indentation bzr revid: vme@tinyerp.com-20121101070828-jiznujjiacg69zl1 --- addons/web_view_editor/static/src/js/view_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 354feaeb28d..dcccd381009 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -77,7 +77,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ $(controller.groups).bind({ 'selected': function(e, ids, records) { self.main_view_id = ids[0]; - } + } }); }); });