SAK-44587 Site creation date not being saved (sakaiproject#8765)

chundcm · Dec 3, 2020 · b3ffbcf · b3ffbcf
1 parent 04c21a3
commit b3ffbcf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
@@ -835,20 +835,13 @@ public User getModifiedBy()
 
 
 	public Date getCreatedDate() {
-		Date date = null;
-		if (m_createdTime != null) {
-			new Date(m_createdTime.toEpochMilli());
-		}
-		return date;
+		return m_createdTime != null ? new Date(m_createdTime.toEpochMilli()) : null;
 	}
 
 	public Date getModifiedDate() {
-		Date date = null;
-		if (m_lastModifiedTime != null) {
-			date = new Date(m_lastModifiedTime.toEpochMilli());
-		}
-		return date;
+		return m_lastModifiedTime != null ? new Date(m_lastModifiedTime.toEpochMilli()) : null;
 	}
+
 	/**
 	 * @inheritDoc
 	 */

diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -1323,6 +1323,7 @@ public String buildMainPanelContext(VelocityPortlet portlet,
 			boolean inShortcut) {
 		context.put("tlang", rb);
 		context.put("clang", cfgRb);
+		context.put("userTimeService", userTimeService);
 		// TODO: what is all this doing? if we are in helper mode, we are
 		// already setup and don't get called here now -ggolden
 		/*

diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm
@@ -248,9 +248,7 @@
 									#end
 								</td>
 								<td headers="createdOn">
-									#set($createdTime="")
-									#set($createdTime = $!site.getCreatedTime())
-									$!createdTime.toStringLocalFull()
+									#if ($site.CreatedDate) $userTimeService.dateTimeFormat($site.CreatedDate, $tlang.Locale, 2) #end
 								</td>
 							</tr>
 						#end