summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-09-24 13:54:26 +0200
committerChristophe Simonis <chs@openerp.com>2012-09-24 13:54:26 +0200
commitd41d28ea5f9cbd31e44560f171cab6c1966615b0 (patch)
treea35b8cad3ed04b70c60d0d5828009191bd05c986 /addons/web/static/src/js
parent443a7ec6cc8c08e940f4a4dbc31ae4528a041381 (diff)
parentf7255ac0b3b7e6b3d2dc67b571f7a169b2019598 (diff)
merge upstream
bzr revid: chs@openerp.com-20120921145630-7ejla348yybsy890 bzr revid: chs@openerp.com-20120924115426-84no8926sccaymmt
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/chrome.js13
-rw-r--r--addons/web/static/src/js/view_form.js116
-rw-r--r--addons/web/static/src/js/view_list.js7
-rw-r--r--addons/web/static/src/js/views.js6
4 files changed, 91 insertions, 51 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3114aaf315f..9fdfb50307f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -79,6 +79,9 @@ instance.web.Dialog = instance.web.Widget.extend({
}
}
if (options) {
+ if (options.buttons) {
+ this.params_buttons = true;
+ }
_.extend(this.dialog_options, options);
}
},
@@ -123,7 +126,13 @@ instance.web.Dialog = instance.web.Widget.extend({
if (! this.dialog_inited)
this.init_dialog();
var o = this.get_options(options);
+ if (! this.params_buttons) {
+ this.$buttons.appendTo($("body"));
+ }
instance.web.dialog(this.$el, o).dialog('open');
+ if (! this.params_buttons) {
+ this.$buttons.appendTo(this.$el.dialog("widget"));
+ }
if (o.height === 'auto' && o.max_height) {
this.$el.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
}
@@ -133,6 +142,10 @@ instance.web.Dialog = instance.web.Widget.extend({
this.renderElement();
var o = this.get_options(options);
instance.web.dialog(this.$el, o);
+ if (! this.params_buttons) {
+ this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" />');
+ this.$el.dialog("widget").append(this.$buttons);
+ }
var res = this.start();
this.dialog_inited = true;
return res;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5b7314a00f2..af1980b7b6e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -162,8 +162,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.$el.find(".oe_form_group_row,.oe_form_field,label").on('click', function (e) {
if(self.get("actual_mode") == "view") {
var $button = self.options.$buttons.find(".oe_form_button_edit");
- $button.effect('bounce', {distance: 18, times: 5}, 150)
+ $button.effect('bounce', {distance: 18, times: 5}, 150);
e.stopPropagation();
+ instance.web.bus.trigger('click', e);
}
});
@@ -270,9 +271,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
if (this.$buttons) {
this.$buttons.show();
}
- if (this.$pager) {
- this.$pager.show();
- }
this.$el.show().css({
opacity: '0',
filter: 'alpha(opacity = 0)'
@@ -408,7 +406,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.$pager.remove();
if (this.get("actual_mode") === "create")
return;
- this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
+ this.$pager = $(QWeb.render("FormView.pager", {'widget':self})).hide();
if (this.options.$pager) {
this.$pager.appendTo(this.options.$pager);
} else {
@@ -421,10 +419,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.do_update_pager();
},
do_update_pager: function(hide_index) {
- var index = hide_index ? '-' : this.dataset.index + 1;
- this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2).end()
- .find('span.oe_pager_index').html(index).end()
- .find('span.oe_pager_count').html(this.dataset.ids.length);
+ this.$pager.toggle(this.dataset.ids.length > 1);
+ if (hide_index) {
+ $(".oe_form_pager_state", this.$pager).html("");
+ } else {
+ $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), this.dataset.index + 1, this.dataset.ids.length));
+ }
},
parse_on_change: function (on_change, widget) {
var self = this;
@@ -2614,6 +2614,7 @@ instance.web.form.CompletionFieldMixin = {
var dataset = new instance.web.DataSet(this, this.field.relation, self.build_context());
var blacklist = this.get_search_blacklist();
+ this.last_query = search_val;
return this.orderer.add(dataset.name_search(
search_val, new instance.web.CompoundDomain(self.build_domain(), [["id", "not in", blacklist]]),
@@ -2721,6 +2722,32 @@ instance.web.form.CompletionFieldMixin = {
},
};
+instance.web.form.M2ODialog = instance.web.Dialog.extend({
+ template: "M2ODialog",
+ init: function(parent) {
+ this._super(parent, {
+ title: _.str.sprintf(_t("Add %s"), parent.string),
+ width: 312,
+ });
+ },
+ start: function() {
+ var self = this;
+ this.$buttons.html(QWeb.render("M2ODialog.buttons"));
+ this.$("input").val(this.getParent().last_query);
+ this.$buttons.find(".oe_form_m2o_qc_button").click(function(){
+ self.getParent()._quick_create(self.$("input").val());
+ self.destroy();
+ });
+ this.$buttons.find(".oe_form_m2o_sc_button").click(function(){
+ self.getParent()._search_create_popup("form", undefined, self.getParent()._create_context(self.$("input").val()));
+ self.destroy();
+ });
+ this.$buttons.find(".oe_form_m2o_cancel_button").click(function(){
+ self.destroy();
+ });
+ },
+});
+
instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, {
template: "FieldMany2One",
init: function(field_manager, node) {
@@ -2751,26 +2778,23 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.render_editable();
this.render_value();
},
+ init_error_displayer: function() {
+ // nothing
+ },
+ hide_error_displayer: function() {
+ // doesn't work
+ },
+ show_error_displayer: function() {
+ new instance.web.form.M2ODialog(this).open();
+ },
render_editable: function() {
var self = this;
this.$input = this.$el.find("input");
- self.$input.tipsy({
- title: function() {
- return QWeb.render('Tipsy.alert', {
- message: "No element was selected, you should create or select one from the dropdown list."
- });
- },
- trigger:'manual',
- fade: true,
- gravity: 's',
- html: true,
- opacity: 1,
- offset: 4,
- });
+ this.init_error_displayer();
self.$input.on('focus', function() {
- self.$input.tipsy("hide");
+ self.hide_error_displayer();
});
this.$drop_down = this.$el.find(".oe_m2o_drop_down_button");
@@ -2824,10 +2848,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
}
}
});
- self.tip_def = $.Deferred();
- self.untip_def = $.Deferred();
- var tip_delay = 200;
- var tip_duration = 15000;
+ self.ed_def = $.Deferred();
+ self.uned_def = $.Deferred();
+ var ed_delay = 200;
+ var ed_duration = 15000;
var anyoneLoosesFocus = function() {
var used = false;
if (self.floating) {
@@ -2847,25 +2871,25 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
}
self.floating = false;
}
- if (used && self.get("value") === false && ! self.no_tipsy) {
- self.tip_def.reject();
- self.untip_def.reject();
- self.tip_def = $.Deferred();
- self.tip_def.then(function() {
- self.$input.tipsy("show");
+ if (used && self.get("value") === false && ! self.no_ed) {
+ self.ed_def.reject();
+ self.uned_def.reject();
+ self.ed_def = $.Deferred();
+ self.ed_def.then(function() {
+ self.show_error_displayer();
});
setTimeout(function() {
- self.tip_def.resolve();
- self.untip_def.reject();
- self.untip_def = $.Deferred();
- self.untip_def.then(function() {
- self.$input.tipsy("hide");
+ self.ed_def.resolve();
+ self.uned_def.reject();
+ self.uned_def = $.Deferred();
+ self.uned_def.then(function() {
+ self.hide_error_displayer();
});
- setTimeout(function() {self.untip_def.resolve();}, tip_duration);
- }, tip_delay);
+ setTimeout(function() {self.uned_def.resolve();}, ed_duration);
+ }, ed_delay);
} else {
- self.no_tipsy = false;
- self.tip_def.reject();
+ self.no_ed = false;
+ self.ed_def.reject();
}
};
var ignore_blur = false;
@@ -3005,13 +3029,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.$input.focus();
},
_quick_create: function() {
- this.no_tipsy = true;
- this.tip_def.reject();
+ this.no_ed = true;
+ this.ed_def.reject();
return instance.web.form.CompletionFieldMixin._quick_create.apply(this, arguments);
},
_search_create_popup: function() {
- this.no_tipsy = true;
- this.tip_def.reject();
+ this.no_ed = true;
+ this.ed_def.reject();
return instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments);
},
});
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 0bee5cad755..8fcda146cd4 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -399,10 +399,14 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
*/
setup_columns: function (fields, grouped) {
var registry = instance.web.list.columns;
+ var reorder = this.options.reorderable;
this.columns.splice(0, this.columns.length);
this.columns.push.apply(this.columns,
_(this.fields_view.arch.children).map(function (field) {
var id = field.attrs.name;
+ if(field.attrs.widget == 'handle' && !reorder){
+ field.attrs.reorderable = reorder || true;
+ }
return registry.for_(id, fields[id], field);
}));
if (grouped) {
@@ -411,9 +415,8 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
}
this.visible_columns = _.filter(this.columns, function (column) {
- return column.invisible !== '1';
+ return column.invisible !== '1' && !column.reorderable;
});
-
this.aggregate_columns = _(this.visible_columns).invoke('to_aggregate');
},
/**
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 02297e9db01..d170aacc89d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -318,8 +318,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
}
return this.ir_actions_common(action, on_close, clear_breadcrumbs);
},
- ir_actions_client: function (action, on_close) {
- return this.ir_actions_common(action, on_close);
+ ir_actions_client: function (action, on_close, clear_breadcrumbs) {
+ return this.ir_actions_common(action, on_close, clear_breadcrumbs);
},
ir_actions_act_window_close: function (action, on_closed) {
if (!this.dialog && on_closed) {
@@ -327,7 +327,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
}
this.dialog_stop();
},
- ir_actions_server: function (action, on_closed) {
+ ir_actions_server: function (action, on_closed, clear_breadcrumbs) {
var self = this;
this.rpc('/web/action/run', {
action_id: action.id,