From 8f3643a57c9fcce4df99ffbd444407a22b906ed5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 9 Jan 2015 13:23:55 +0530 Subject: [PATCH 1/2] [fix] End Date error on dragging an all day calendar event --- frappe/public/js/frappe/views/calendar.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/calendar.js b/frappe/public/js/frappe/views/calendar.js index 44f1bcb2b2..97b7b8007a 100644 --- a/frappe/public/js/frappe/views/calendar.js +++ b/frappe/public/js/frappe/views/calendar.js @@ -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 }; From cf23ef1eb3e159c5be5a3d699e47da49c93b48b6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 9 Jan 2015 14:24:13 +0530 Subject: [PATCH 2/2] [fix] strip (/ ) from route when rendering page --- frappe/website/render.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index 613c88d862..6f521dabe7 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -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)