summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-07-05 08:55:33 +0200
committerXavier Morel <xmo@openerp.com>2011-07-05 08:55:33 +0200
commit2f8dba7b4a7d585738974b50876afeb96bc6e104 (patch)
treebb6c72b602f3cc0349c0df2faa26953669fb0f26 /addons/base/static/src
parent41ce7d903dced2f479115c242918373ba68ea42c (diff)
[IMP] move actionmanager creation to treeview constructor, nest & simplify action definition, make anonymous (we don't need the variable)
bzr revid: xmo@openerp.com-20110705065533-hr88cj252ejoqxfp
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/tree.js36
1 files changed, 17 insertions, 19 deletions
diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js
index 6dc8a59c167..5bee6add97d 100644
--- a/addons/base/static/src/js/tree.js
+++ b/addons/base/static/src/js/tree.js
@@ -27,6 +27,9 @@ openerp.base.TreeView = openerp.base.View.extend({
console.log(this.view_manager.action);
this.view_manager.flags.search_view = this.view_manager.action.flags.search_view = false;
this.view_manager.flags.sidebar = this.view_manager.action.flags.sidebar = false;
+
+ this.actionmanager = new openerp.base.ActionManager(this.session, this.element_id);
+ this.actionmanager.start();
},
start: function () {
@@ -117,7 +120,7 @@ openerp.base.TreeView = openerp.base.View.extend({
$(this).css('color','#000000');
});
- self.$element.find('tr[id ^= treerow_]').find('td').children(':first-child').click( function() {
+ self.$element.find('tr[id ^= treerow_] td').children(':first-child').click( function() {
var is_loaded = 0;
if ($(this).length == 1) {
record_id = (this.id).split('_')[1];
@@ -169,27 +172,22 @@ openerp.base.TreeView = openerp.base.View.extend({
}
views.push(view);
});
- var action = {
+ this.actionmanager.do_action({
"res_model" : self.dataset.model,
"domain" : self.dataset.domain,
"views" : views,
"type" : "ir.actions.act_window",
"auto_search" : true,
- "view_type" : "list",
- "view_mode" : "list"
- }
- action.flags = {
- search_view: true,
- sidebar : true,
- views_switcher : true,
- action_buttons : true,
- pager: true,
- new_window : true
- }
-
- this.actionmanager = new openerp.base.ActionManager(self.session, self.element_id);
- this.actionmanager.start()
- this.actionmanager.do_action(action);
+ "view_mode" : "list",
+ "flags": {
+ search_view: true,
+ sidebar : true,
+ views_switcher : true,
+ action_buttons : true,
+ pager: true,
+ new_window : true
+ }
+ });
self.dataset.model = model;
},
@@ -271,6 +269,6 @@ openerp.base.TreeView = openerp.base.View.extend({
do_hide: function () {
this.$element.hide();
this.hidden = true;
- },
+ }
});
-} \ No newline at end of file
+};