pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_calendar: check for edit access rights + use correct display mode (view or edit) when going into a document form view from the calendar.

Browse Source
This commit is contained in:
Thibault Delavallée
2014-06-19 12:26:24 +02:00
parent 1a639ccd03
commit 3dcdd2180a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/js/web_calendar.js
+12 -2
View File
@@ -212,7 +212,12 @@ openerp.web_calendar = function(instance) {
this.info_fields.push(fv.arch.children[fld].attrs.name);
}
return (new instance.web.Model(this.dataset.model))
var edit_check = new instance.web.Model(this.dataset.model)
.call("check_access_rights", ["write", false])
.then(function (write_right) {
self.write_right = write_right;
});
var init = new instance.web.Model(this.dataset.model)
.call("check_access_rights", ["create", false])
.then(function (create_right) {
self.create_right = create_right;
@@ -222,6 +227,7 @@ openerp.web_calendar = function(instance) {
self.ready.resolve();
});
});
return $.when(edit_check, init);
},
get_fc_init_options: function () {
@@ -834,7 +840,11 @@ openerp.web_calendar = function(instance) {
if (! this.open_popup_action) {
var index = this.dataset.get_id_index(id);
this.dataset.index = index;
this.do_switch_view('form', null, { mode: "edit" });
if (this.write_right) {
this.do_switch_view('form', null, { mode: "edit" });
} else {
this.do_switch_view('form', null, { mode: "view" });
}
}
else {
var pop = new instance.web.form.FormOpenPopup(this);