diff --git a/core/doctype/event/event.js b/core/doctype/event/event.js index d962ae6800..f469f882a8 100644 --- a/core/doctype/event/event.js +++ b/core/doctype/event/event.js @@ -21,7 +21,7 @@ // cur_frm.cscript.add_list_breadcrumb = function(appframe) { - appframe.add_breadcrumb("icon-calendar", "calendar", "Calendar"); + appframe.add_breadcrumb("icon-calendar", "Calendar/Event", "Calendar"); } cur_frm.cscript.refresh = function(doc, cdt, cdn) { diff --git a/core/doctype/event/event.py b/core/doctype/event/event.py index 797f287181..1465f27c8c 100644 --- a/core/doctype/event/event.py +++ b/core/doctype/event/event.py @@ -40,7 +40,8 @@ def get_events(start, end): `tabEvent User`.parent=tabEvent.name and person=%s) or exists(select * from `tabEvent Role` where `tabEvent Role`.parent=tabEvent.name - and `tabEvent Role`.role in ('%s')))""" % ('%s', '%s', '%s', '%s', '%s', '%s', + and `tabEvent Role`.role in ('%s'))) + order by starts_on""" % ('%s', '%s', '%s', '%s', '%s', '%s', "', '".join(roles)), (start, end, start, end, webnotes.session.user, webnotes.session.user), as_dict=1) diff --git a/webnotes/utils/dateutils.py b/webnotes/utils/dateutils.py index c462385f24..baec2e8370 100644 --- a/webnotes/utils/dateutils.py +++ b/webnotes/utils/dateutils.py @@ -23,6 +23,7 @@ from __future__ import unicode_literals import webnotes import datetime +from webnotes.utils import get_datetime # global values -- used for caching user_date_format = None @@ -78,3 +79,11 @@ def get_user_date_format(): user_date_format = webnotes.conn.get_value("Control Panel", None, "date_format") return user_date_format +def datetime_in_user_format(date_time): + if isinstance(date_time, basestring): + date_time = get_datetime(date_time) + from webnotes.utils import formatdate + return formatdate(date_time.date()) + " " + date_time.strftime("%H:%M") + + + \ No newline at end of file