Bladeren bron

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

[fix] End Date error on dragging an all day calendar event
version-14
Anand Doshi 10 jaren geleden
bovenliggende
commit
1b93c8ee06
2 gewijzigde bestanden met toevoegingen van 10 en 6 verwijderingen
  1. +9
    -5
      frappe/public/js/frappe/views/calendar.js
  2. +1
    -1
      frappe/website/render.py

+ 9
- 5
frappe/public/js/frappe/views/calendar.js Bestand weergeven

@@ -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 };


+ 1
- 1
frappe/website/render.py Bestand weergeven

@@ -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)


Laden…
Annuleren
Opslaan