diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index db880a119ba..4bbe3bcb516 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -196,6 +196,13 @@ openerp.web_calendar = function(instance) {
} else {
this.avatar_title = attrs.avatar_title;
}
+
+ if (isNullOrUndef(attrs.avatar_filter)) {
+ this.avatar_filter = this.avatar_model;
+ } else {
+ this.avatar_filter = attrs.avatar_filter;
+ }
+
this.color_field = attrs.color;
if (this.color_field && this.selected_filters.length === 0) {
@@ -577,7 +584,7 @@ openerp.web_calendar = function(instance) {
if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
tempColor = (self.all_filters[the_attendee_people] !== undefined)
? self.all_filters[the_attendee_people].color
- : self.all_filters[-1].color;
+ : (self.all_filters[-1] ? self.all_filters[-1].color : 1);
the_title_avatar += '';
}//else don't add myself
}
@@ -700,7 +707,6 @@ openerp.web_calendar = function(instance) {
}
if (!self.useContacts) { // If we use all peoples displayed in the current month as filter in sidebars
-
var filter_value;
var filter_item;
@@ -713,7 +719,7 @@ openerp.web_calendar = function(instance) {
value: filter_value,
label: e[self.color_field][1],
color: self.get_color(filter_value),
- avatar_model: self.avatar_model,
+ avatar_model: (_.str.toBoolElse(self.avatar_filter, true) ? self.avatar_filter : false ),
is_checked: true
};
self.all_filters[e[self.color_field][0]] = filter_item;
@@ -734,7 +740,7 @@ openerp.web_calendar = function(instance) {
return null;
});
}
- return self.perform_necessary_name_gets(events).then(callback);
+
}
else { //WE USE CONTACT
if (self.attendee_people !== undefined) {
@@ -751,25 +757,27 @@ openerp.web_calendar = function(instance) {
}
}
- var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; });
- all_attendees = _.chain(all_attendees).flatten().uniq().value();
+
+ }
- self.all_attendees = {};
- if (self.avatar_title !== null) {
- new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) {
- _.each(result, function(item) {
- self.all_attendees[item.id] = item.name;
- });
- }).done(function() {
- return self.perform_necessary_name_gets(events).then(callback);
- });
- }
- else {
- _.each(all_attendees,function(item){
- self.all_attendees[item] = '';
+ var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; });
+ all_attendees = _.chain(all_attendees).flatten().uniq().value();
+
+ self.all_attendees = {};
+ if (self.avatar_title !== null) {
+ new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) {
+ _.each(result, function(item) {
+ self.all_attendees[item.id] = item.name;
});
+ }).done(function() {
return self.perform_necessary_name_gets(events).then(callback);
- }
+ });
+ }
+ else {
+ _.each(all_attendees,function(item){
+ self.all_attendees[item] = '';
+ });
+ return self.perform_necessary_name_gets(events).then(callback);
}
});
},
diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js
index 25a1f932cc4..e4e074b2e7f 100644
--- a/addons/web_graph/static/src/js/graph_view.js
+++ b/addons/web_graph/static/src/js/graph_view.js
@@ -167,7 +167,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
row_search_facet = query.findWhere({category:'GroupBy'});
if (row_search_facet) {
- row_search_facet.values.reset(row_facet.values);
+ row_search_facet.values.reset(row_facet.values, {focus_input:false});
} else {
if (row_groupby.length) {
query.add(row_facet);
@@ -181,7 +181,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
col_search_facet = query.findWhere({category:'ColGroupBy'});
if (col_search_facet) {
- col_search_facet.values.reset(col_facet.values);
+ col_search_facet.values.reset(col_facet.values, {focus_input:false});
} else {
if (col_groupby.length) {
query.add(col_facet);
diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index ce73a0b51c6..9946e149d96 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -51,7 +51,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
this.search_view = parent.searchview;
openerp.session.rpc('/web_graph/check_xlwt').then(function (result) {
- self.$('.graph_options_selection label').toggle(result);
+ self.$('.graph_options_selection label').last().toggle(result);
});
return this.model.call('fields_get', []).then(function (f) {
@@ -296,11 +296,11 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
if (header.expanded) {
this.fold(header);
return;
- }
+ }
if (header.path.length < header.root.groupby.length) {
this.expand(id);
return;
- }
+ }
if (!this.important_fields.length) {
return;
}
@@ -499,10 +499,12 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
// Main display method
// ----------------------------------------------------------------------
display_data: function () {
+ var scroll = $(window).scrollTop();
this.$('.graph_main_content svg').remove();
this.$('.graph_main_content div').remove();
this.table.empty();
this.table.toggleClass('heatmap', this.heatmap_mode !== 'none');
+ this.$('.graph_options_selection label').last().toggleClass('disabled', this.pivot.no_data);
this.width = this.$el.width();
this.height = Math.min(Math.max(document.documentElement.clientHeight - 116 - 60, 250), Math.round(0.8*this.$el.width()));
@@ -512,6 +514,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
} else {
if (this.mode === 'pivot') {
this.draw_table();
+ $(window).scrollTop(scroll);
} else {
this.$('.graph_main_content').append($('