浏览代码

[fix] Update Event when starts_on == ends_on

version-14
Anand Doshi 10 年前
父节点
当前提交
d618d45c10
共有 3 个文件被更改,包括 7 次插入2 次删除
  1. +5
    -0
      frappe/core/doctype/event/event.py
  2. +1
    -1
      frappe/public/js/frappe/views/calendar.js
  3. +1
    -1
      frappe/widgets/calendar.py

+ 5
- 0
frappe/core/doctype/event/event.py 查看文件

@@ -14,6 +14,11 @@ class Event(Document):
def validate(self):
if self.starts_on and self.ends_on and self.starts_on > self.ends_on:
frappe.msgprint(frappe._("Event end must be after start"), raise_exception=True)

if self.starts_on == self.ends_on:
# this scenario doesn't make sense i.e. it starts and ends at the same second!
self.ends_on = None

if self.starts_on and self.ends_on and int(date_diff(self.ends_on.split(" ")[0], self.starts_on.split(" ")[0])) > 0 \
and self.repeat_on == "Every Day":
frappe.msgprint(frappe._("Every day events should finish on the same day."), raise_exception=True)


+ 1
- 1
frappe/public/js/frappe/views/calendar.js 查看文件

@@ -207,7 +207,7 @@ frappe.views.Calendar = Class.extend({
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 {
} else if (event.end) {
args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.end);
}
}


+ 1
- 1
frappe/widgets/calendar.py 查看文件

@@ -13,6 +13,6 @@ def update_event(args, field_map):
field_map = frappe._dict(json.loads(field_map))
w = frappe.get_doc(args.doctype, args.name)
w.set(field_map.start, args[field_map.start])
w.set(field_map.end, args[field_map.end])
w.set(field_map.end, args.get(field_map.end))
w.save()


正在加载...
取消
保存