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

datetime in user format and fixes in calendar breadcrumb

Browse source
This commit is contained in:
Anand Doshi 2013-02-16 14:52:02 +05:30
parent 1429a6105f
commit 3afed698ec
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/doctype/event/event.js
View file

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

3
core/doctype/event/event.py
View file

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

9
webnotes/utils/dateutils.py
View file

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