Screen doesn't have parent, it is Group

review13371004
This commit is contained in:
Cédric Krier committed 2014-07-09 00:30:23 +02:00
1 parent b50622f4e5
commit 0ca137f3e7
3 files changed
+10 -11

No files matched your search

+7 -8
View File
@@ -150,7 +150,6 @@
this.search_count = 0;
this.screen_container = new Sao.ScreenContainer(
attributes.tab_domain);
this.parent = null;
if (!attributes.row_activate) {
this.row_activate = this.default_row_activate;
} else {
@@ -241,7 +240,7 @@
search_filter: function(search_string) {
var domain = [];
if (this.domain_parser && !this.parent) {
if (this.domain_parser && !this.group.parent) {
if (search_string || search_string === '') {
domain = this.domain_parser.parse(search_string);
} else {
@@ -686,8 +685,8 @@
if (written) {
this.group.written(ids);
}
if (this.parent) {
this.parent.root_parent().reload();
if (this.group.parent) {
this.group.parent.root_parent().reload();
}
this.display();
},
@@ -747,10 +746,10 @@
}
} else if (action == 'delete') {
if (access['delete']) {
this.remove(!this.parent, false, !this.parent);
this.remove(!this.group.parent, false, !this.group.parent);
}
} else if (action == 'remove') {
if (access.write && access.read && this.parent) {
if (access.write && access.read && this.group.parent) {
this.remove(false, true, false);
}
} else if (action == 'copy') {
@@ -794,7 +793,7 @@
} else if ((view.view_type == 'tree') &&
(view.children_field)) {
var parent_, paths, selected_paths, tree_state_model;
parent_ = this.parent ? this.parent.id : null;
parent_ = this.group.parent ? this.group.parent.id : null;
paths = view.get_expanded_paths();
selected_paths = view.get_selected_paths();
if (!(parent_ in this.tree_states)) {
@@ -831,7 +830,7 @@
if (!view || (view.view_type != 'tree') || !this.group) {
return;
}
parent_ = this.parent ? this.parent.id : null;
parent_ = this.group.parent ? this.group.parent.id : null;
if (!(parent_ in this.tree_states)) {
this.tree_states[parent_] = {};
}
+2 -2
View File
@@ -2769,7 +2769,7 @@
if (field === undefined) {
this.screen.new_group();
this.screen.set_current_record(null);
this.screen.parent = true;
this.screen.group.parent = null;
this.screen.display();
return;
}
@@ -2989,7 +2989,7 @@
if (field === undefined) {
this.screen.new_group();
this.screen.set_current_record(null);
this.screen.parent = true;
this.screen.group.parent = null;
this.screen.display();
return;
}
+1 -1
View File
@@ -312,7 +312,7 @@
});
screen.switch_view().done(function() {
screen.search_filter();
screen.parent = record;
screen.group.parent = record;
});
Sao.Window.Attachment._super.init.call(this, screen, this.callback,
{view_type: 'tree'});