From 5964ecc70c164ba1023bd413c8e643ee703bab8f Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 17 Oct 2012 10:34:23 -0400 Subject: [PATCH] remove work in progress regarding convert datetime to localtime --- cms/djangoapps/contentstore/utils.py | 3 +-- cms/djangoapps/contentstore/views.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 4889506bd8..582123b78f 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -76,6 +76,5 @@ def compute_unit_state(unit): return UnitState.public -def get_date_display(date, convertToLocalTime=False): - print date.__class__.__name__ +def get_date_display(date): return date.strftime("%d %B, %Y at %I:%M %p") diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 64f301e1fc..d95322f2f8 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -872,7 +872,7 @@ def asset_index(request, org, course, name): id = asset['_id'] display_info = {} display_info['displayname'] = asset['displayname'] - display_info['uploadDate'] = get_date_display(asset['uploadDate'], True) + display_info['uploadDate'] = get_date_display(asset['uploadDate']) asset_location = StaticContent.compute_location(id['org'], id['course'], id['name']) display_info['url'] = StaticContent.get_url_path_from_location(asset_location)