Displays the date, time, and username of the most recent save and publish

Conflicts:
	cms/djangoapps/contentstore/views/item.py
This commit is contained in:
Ben McMorran
2014-07-08 15:41:34 -04:00
committed by cahrens
parent 7cb5c4d7b8
commit 572b4fc030
10 changed files with 161 additions and 14 deletions

View File

@@ -566,8 +566,10 @@ def create_xblock_info(usage_key, xblock, data=None, metadata=None):
"category": xblock.category,
"has_changes": modulestore().has_changes(usage_key),
"published": publish_state in (PublishState.public, PublishState.draft),
"edited_on": get_default_time_display(xblock.edited_on) if xblock.edited_on else None,
"edited_by": safe_get_username(xblock.edited_by)
"edited_on": get_default_time_display(xblock.subtree_edited_on) if xblock.subtree_edited_on else None,
"edited_by": safe_get_username(xblock.subtree_edited_by),
"published_on": get_default_time_display(xblock.published_date) if xblock.published_date else None,
"published_by": safe_get_username(xblock.published_by),
}
if data is not None:
xblock_info["data"] = data