From 7fed8926843d792cdd9a450b51186c2feab5a254 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 14:25:22 +0200 Subject: [PATCH 1/8] [ADD] retain currently activated view bzr revid: fme@openerp.com-20110331122522-3v7coio2wpnzsszn --- addons/base/static/src/js/views.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index b0b79c3e5f7..9eabb419151 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -35,12 +35,14 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ this.searchview_id = false; this.searchview = null; this.search_visible = true; + this.active_view = null; // this.views = { "list": { "view_id":1234, "controller": instance} } this.views = {}; }, start: function() { }, on_mode_switch: function(view_type) { + this.active_view = view_type; for (var i in this.views) { this.views[i].controller.$element.toggle(i === view_type); } From 4722165efb3cfaffd4d4f4215d47c1eccc9b8b1a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 14:25:42 +0200 Subject: [PATCH 2/8] [REM] Removed wrong action reference in action manager bzr revid: fme@openerp.com-20110331122542-gnlxfg2unxvlqut8 --- addons/base/static/src/js/views.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 9eabb419151..4fa2e7c2fc9 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -8,7 +8,6 @@ openerp.base.ActionManager = openerp.base.Controller.extend({ // process all kind of actions init: function(session, element_id) { this._super(session, element_id); - this.action = null; this.viewmanager = null; }, /** @@ -17,7 +16,6 @@ openerp.base.ActionManager = openerp.base.Controller.extend({ */ do_action: function(action) { // instantiate the right controllers by understanding the action - this.action = action; if(action.type == "ir.actions.act_window") { this.viewmanager = new openerp.base.ViewManager(this.session,this.element_id); this.viewmanager.do_action_window(action); From 911af887b9665635e6d3b479cffdeb832b04528c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 14:35:19 +0200 Subject: [PATCH 3/8] [IMP] do_action really switch to first view in sequence bzr revid: fme@openerp.com-20110331123519-uk4pkd5azix545ji --- addons/base/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 4fa2e7c2fc9..a472ac5e748 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -106,7 +106,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ } } // switch to the first one in sequence - this.on_mode_switch("tree"); + this.on_mode_switch(action.views[0][1]); }, // create when root, also add to parent when o2m on_create: function() { From f64b7d3b8c17acc045727afbf1ffdd7fdfcad271 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 15:20:58 +0200 Subject: [PATCH 4/8] [IMP] Lazy loading of views bzr revid: fme@openerp.com-20110331132058-w6g87wsxof3kyiqv --- addons/base/static/src/css/base.css | 5 +++ addons/base/static/src/js/views.js | 50 +++++++++++++++++------------ addons/base/static/src/xml/base.xml | 9 +++--- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 58adf4183e4..a66a93eb017 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -395,6 +395,11 @@ body.openerp { padding-left: 10px; } +/* View Manager */ +.openerp .views_switchers { + text-align: right; +} + /* Form */ .openerp .required.error { border: 1px solid #900; diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index a472ac5e748..164e5d6cf72 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -41,8 +41,31 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ }, on_mode_switch: function(view_type) { this.active_view = view_type; + var view = this.views[view_type]; + if (!view.controller) { + // Lazy loading of views + var controller; + switch (view_type) { + case 'tree': + controller = new openerp.base.ListView(this.session, this.element_id + "_view_tree", this.dataset, view.view_id); + break; + case 'form': + controller = new openerp.base.FormView(this.session, this.element_id + "_view_form", this.dataset, view.view_id); + break; + case 'calendar': + controller = new openerp.base.CalendarView(this.session, this.element_id + "_view_calendar", this.dataset, view.view_id); + break; + case 'gantt': + controller = new openerp.base.GanttView(this.session, this.element_id + "_view_gantt", this.dataset, view.view_id); + break; + } + controller.start(); + this.views[view_type].controller = controller; + } for (var i in this.views) { - this.views[i].controller.$element.toggle(i === view_type); + if (this.views[i].controller) { + this.views[i].controller.$element.toggle(i === view_type); + } } }, /** @@ -86,25 +109,12 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ searchview.do_search); } } - for(var i = 0; i < action.views.length; i++) { - var view_id, controller; - view_id = action.views[i][0]; - if(action.views[i][1] == "tree") { - controller = new openerp.base.ListView(this.session, this.element_id + "_view_tree", this.dataset, view_id); - controller.start(); - this.views.tree = { view_id: view_id, controller: controller }; - this.$element.find(prefix_id + "_button_tree").bind('click',function(){ - self.on_mode_switch("tree"); - }); - } else if(action.views[i][1] == "form") { - controller = new openerp.base.FormView(this.session, this.element_id + "_view_form", this.dataset, view_id); - controller.start(); - this.views.form = { view_id: view_id, controller: controller }; - this.$element.find(prefix_id + "_button_form").bind('click',function(){ - self.on_mode_switch("form"); - }); - } - } + this.$element.find('.views_switchers button').click(function() { + self.on_mode_switch($(this).data('view-type')); + }); + _.each(action.views, function(view) { + self.views[view[1]] = { view_id: view[0], controller: null }; + }); // switch to the first one in sequence this.on_mode_switch(action.views[0][1]); }, diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 3124f5a5686..4cc8bb135a6 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -126,12 +126,11 @@ -
- +
- +
From 4d76991c55bc25091cf2941160736e2c9e9139a5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 16:44:22 +0200 Subject: [PATCH 5/8] [FIX] Search is now done by the view and not by the viewmanager bzr revid: fme@openerp.com-20110331144422-34wmf2bauc0lmz7d --- addons/base/static/src/js/form.js | 2 ++ addons/base/static/src/js/list.js | 17 +++++++++++++++++ addons/base/static/src/js/views.js | 30 ++++++++++-------------------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 9c0f8e9bf6b..be82b19c857 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -91,6 +91,8 @@ openerp.base.FormView = openerp.base.Controller.extend({ }, on_saved: function() { // Check response for exceptions, display error + }, + do_search: function (domains, contexts, groupbys) { } }); diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index f572bbb6eb9..4d4f6b4878c 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -8,6 +8,9 @@ openerp.base.ListView = openerp.base.Controller.extend({ this.model = dataset.model; this.view_id = view_id; this.name = ""; + // TODO: default to action.limit + // TODO: decide if limit is a property of DataSet and thus global to all views (calendar ?) + this.limit = 80; this.cols = []; @@ -72,6 +75,20 @@ openerp.base.ListView = openerp.base.Controller.extend({ return record.values; })); + }, + do_search: function (domains, contexts, groupbys) { + var self = this; + this.rpc('/base/session/eval_domain_and_context', { + domains: domains, + contexts: contexts, + group_by_seq: groupbys + }, function (results) { + // TODO: handle non-empty results.group_by with read_group + self.dataset.set({ + context: results.context, + domain: results.domain + }).fetch(0, self.limit); + }); } }); diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 164e5d6cf72..5acdd44ae65 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -34,6 +34,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ this.searchview = null; this.search_visible = true; this.active_view = null; + this.auto_search = false; // this.views = { "list": { "view_id":1234, "controller": instance} } this.views = {}; }, @@ -61,6 +62,10 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ } controller.start(); this.views[view_type].controller = controller; + if (this.auto_search) { + this.searchview.on_loaded.add_last(this.searchview.do_search); + this.auto_search = false; + } } for (var i in this.views) { if (this.views[i].controller) { @@ -95,19 +100,18 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ this.$element.html(QWeb.render("ViewManager", {"prefix": this.element_id, views: action.views})); this.searchview_id = false; - if(this.search_visible && action.search_view_id) { + if (this.search_visible && action.search_view_id) { this.searchview_id = action.search_view_id[0]; var searchview = this.searchview = new openerp.base.SearchView( this.session, this.element_id + "_search", this.dataset, this.searchview_id, this.search_defaults()); - searchview.on_search.add(this.do_search); + searchview.on_search.add(function() { + self.views[self.active_view].controller.do_search.apply(self, arguments); + }); searchview.start(); - if (action['auto_search']) { - searchview.on_loaded.add_last( - searchview.do_search); - } + this.auto_search = action.auto_search; } this.$element.find('.views_switchers button').click(function() { self.on_mode_switch($(this).data('view-type')); @@ -124,20 +128,6 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ on_remove: function() { }, on_edit: function() { - }, - do_search: function (domains, contexts, groupbys) { - var self = this; - this.rpc('/base/session/eval_domain_and_context', { - domains: domains, - contexts: contexts, - group_by_seq: groupbys - }, function (results) { - // TODO: handle non-empty results.group_by with read_group - self.dataset.set({ - context: results.context, - domain: results.domain - }).fetch(0, self.action.limit); - }); } }); From 79ce2be95efecbe39614a533524484abc4a99cd5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 17:14:41 +0200 Subject: [PATCH 6/8] [IMP] DataSet has no more notion of fields. These are now inherent to the views. bzr revid: fme@openerp.com-20110331151441-z5xtn0j4kohi72ja --- addons/base/static/src/js/data.js | 27 +++++++-------------------- addons/base/static/src/js/list.js | 2 +- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 2fd4d9f8b6b..ad4028fb155 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -32,8 +32,6 @@ openerp.base.DataSet = openerp.base.Controller.extend( this._super(session); this.model = model; - this._fields = null; - this._ids = []; this._active_ids = null; this._active_id_index = 0; @@ -43,12 +41,6 @@ openerp.base.DataSet = openerp.base.Controller.extend( this._context = {}; }, start: function() { - // TODO: fields_view_get fields selection? - this.rpc("/base/dataset/fields", {"model":this.model}, this.on_fields); - }, - on_fields: function(result) { - this._fields = result.fields; - this.on_ready(); }, /** @@ -63,12 +55,11 @@ openerp.base.DataSet = openerp.base.Controller.extend( * @param {Number} [limit=null] The maximum number of records to return * @returns itself */ - fetch: function (offset, limit) { + fetch: function (fields, offset, limit) { offset = offset || 0; - limit = limit || null; this.rpc('/base/dataset/find', { model: this.model, - fields: this._fields, + fields: fields, domain: this._domain, context: this._context, sort: this._sort, @@ -77,9 +68,7 @@ openerp.base.DataSet = openerp.base.Controller.extend( }, _.bind(function (records) { var data_records = _.map( records, function (record) { - return new openerp.base.DataRecord( - this.session, this.model, - this._fields, record); + return new openerp.base.DataRecord(this.session, this.model, fields, record); }, this); this.on_fetch(data_records, { @@ -116,16 +105,14 @@ openerp.base.DataSet = openerp.base.Controller.extend( * * @returns itself */ - active_ids: function () { + active_ids: function (fields) { this.rpc('/base/dataset/get', { ids: this.get_active_ids(), model: this.model }, _.bind(function (records) { this.on_active_ids(_.map( records, function (record) { - return new openerp.base.DataRecord( - this.session, this.model, - this._fields, record); + return new openerp.base.DataRecord(this.session, this.model, fields, record); }, this)); }, this)); return this; @@ -149,7 +136,7 @@ openerp.base.DataSet = openerp.base.Controller.extend( * * @returns itself */ - active_id: function () { + active_id: function (fields) { this.rpc('/base/dataset/get', { ids: [this.get_active_id()], model: this.model @@ -158,7 +145,7 @@ openerp.base.DataSet = openerp.base.Controller.extend( this.on_active_id( record && new openerp.base.DataRecord( this.session, this.model, - this._fields, record)); + fields, record)); }, this)); return this; }, diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index 4d4f6b4878c..e63a063af7f 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -87,7 +87,7 @@ openerp.base.ListView = openerp.base.Controller.extend({ self.dataset.set({ context: results.context, domain: results.domain - }).fetch(0, self.limit); + }).fetch(self.fields_view.fields, 0, self.limit); }); } }); From 6de5177cf314fa80fbf2e2b48ee29a153638db60 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 18:03:09 +0200 Subject: [PATCH 7/8] [ADD] calendar image bzr revid: fme@openerp.com-20110331160309-0jybr51uf03ygizh --- addons/base/static/src/img/ui/field_calendar.png | Bin 0 -> 454 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/base/static/src/img/ui/field_calendar.png diff --git a/addons/base/static/src/img/ui/field_calendar.png b/addons/base/static/src/img/ui/field_calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..99a1f3f9ef1b07bf0385eefb5f3d6d5fcd2af4b3 GIT binary patch literal 454 zcmV;%0XhDOP)Q^fPI6jb+d|@`N^P8ZCnlXtvx#1dz>s4p`63Ko=O*@E0e*Xlvl05*JydPcV3@b8j^s^kyFprPd^ z&icYiRsRH(uhHoZi4Wr@agX?Q3g_`8xQiqrr+3)l64*Gt#ag67KTkmJl!#DCa~f$K w)a@oQr=i7MY3xA*ql1<)h&dH)5CJvm8}XjbDoaBt5C8xG07*qoM6N<$f(WI^)c^nh literal 0 HcmV?d00001 From 6910a9c19af797bdee9c7d2dc315154810738c40 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Mar 2011 18:03:23 +0200 Subject: [PATCH 8/8] [ADD] Activated simple datepicker on date field bzr revid: fme@openerp.com-20110331160323-opcovdlczzi6ugxs --- addons/base/static/src/css/base.css | 3 +++ addons/base/static/src/js/form.js | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 58adf4183e4..2fb34ecf78c 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -413,6 +413,9 @@ body.openerp { border-radius: 3px; background: white; } +.openerp input.field_date { + background: url('../img/ui/field_calendar.png') no-repeat right center; +} /* Widgets */ .openerp .separator { diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 9c0f8e9bf6b..65238e1def3 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -462,6 +462,10 @@ openerp.base.form.FieldDate = openerp.base.form.FieldChar.extend({ init: function(view, node) { this._super(view, node); this.template = "FieldDate"; + }, + start: function() { + this._super.apply(this, arguments); + this.$element.find('input').datepicker(); } });