fixes in editable calendar
This commit is contained in:
parent
4a98524819
commit
d17c7415cb
1 changed files with 9 additions and 6 deletions
|
|
@ -115,8 +115,10 @@ wn.views.Calendar = Class.extend({
|
|||
},
|
||||
eventClick: function(event, jsEvent, view) {
|
||||
// edit event description or delete
|
||||
if(wn.model.can_read(me.doctype))
|
||||
wn.set_route("Form", me.doctype, event.name);
|
||||
var doctype = event.doctype || me.doctype;
|
||||
if(wn.model.can_read(doctype)) {
|
||||
wn.set_route("Form", doctype, event.name);
|
||||
}
|
||||
},
|
||||
eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc) {
|
||||
me.update_event(event, revertFunc);
|
||||
|
|
@ -160,19 +162,20 @@ wn.views.Calendar = Class.extend({
|
|||
var me = this;
|
||||
$.each(events, function(i, d) {
|
||||
d.id = d.name;
|
||||
d.editable = wn.model.can_write(d.doctype || this.doctype);
|
||||
d.editable = wn.model.can_write(d.doctype || me.doctype);
|
||||
|
||||
// do not allow submitted/cancelled events to be moved / extended
|
||||
if(d.docstatus && d.docstatus > 0)
|
||||
if(d.docstatus && d.docstatus > 0) {
|
||||
d.editable = false;
|
||||
|
||||
}
|
||||
|
||||
$.each(me.field_map, function(target, source) {
|
||||
d[target] = d[source];
|
||||
});
|
||||
|
||||
if(!me.field_map.allDay)
|
||||
d.allDay = 1;
|
||||
|
||||
|
||||
if(d.status) {
|
||||
if(me.style_map) {
|
||||
$.extend(d, me.styles[me.style_map[d.status]] || {});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue