vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #965 from anandpdoshi/anand-jan-9

Browse source 
[fix] End Date error on dragging an all day calendar event
This commit is contained in:
Anand Doshi 2015-01-09 15:53:48 +05:30
commit 1b93c8ee06
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/public/js/frappe/views/calendar.js
View file

@ -199,15 +199,19 @@ frappe.views.Calendar = Class.extend({
var args = {
name: event[this.field_map.id]
};
args[this.field_map.start]
= frappe.datetime.get_datetime_as_string(event.start);
if(this.field_map.end)
args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.end);
args[this.field_map.start] = frappe.datetime.get_datetime_as_string(event.start);
if(this.field_map.allDay)
args[this.field_map.allDay] = event.allDay ? 1 : 0;
if(this.field_map.end) {
if (args[this.field_map.allDay]) {
args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.start);
} else {
args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.end);
}
}
args.doctype = event.doctype || this.doctype;
return { args: args, field_map: this.field_map };

2
frappe/website/render.py
View file

@ -17,7 +17,7 @@ class PageNotFoundError(Exception): pass
def render(path, http_status_code=None):
"""render html page"""
path = resolve_path(path.strip("/"))
path = resolve_path(path.strip("/ "))
try:
data = render_page(path)