LPS-101667 Use the size from the file version instead of the file ent…

…ry so that the appropriate size is displayed
adolfopa · Sep 17, 2019 · 042e60c · 042e60c
1 parent 6de46ce
commit 042e60c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java b/.../java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java
@@ -461,7 +461,7 @@ public void addDownloadMenuItem(List<MenuItem> menuItems)
 		}
 
 		String label = TextFormatter.formatStorageSize(
-			_fileEntry.getSize(), _themeDisplay.getLocale());
+			_fileVersion.getSize(), _themeDisplay.getLocale());
 
 		label = StringBundler.concat(
 			_themeDisplay.translate("download"), " (", label, ")");
@@ -501,7 +501,7 @@ public void addDownloadToolbarItem(List<ToolbarItem> toolbarItems)
 		}
 
 		String label = TextFormatter.formatStorageSize(
-			_fileEntry.getSize(), _themeDisplay.getLocale());
+			_fileVersion.getSize(), _themeDisplay.getLocale());
 
 		_addURLUIItem(
 			new URLToolbarItem(), toolbarItems, DLUIItemKeys.DOWNLOAD,

diff --git a/...rary-web/src/main/resources/META-INF/resources/document_library/info_panel_file_entry.jsp b/...rary-web/src/main/resources/META-INF/resources/document_library/info_panel_file_entry.jsp
@@ -334,7 +334,7 @@ long assetClassPK = DLAssetHelperUtil.getAssetClassPK(fileEntry, fileVersion);
 					<liferay-ui:message key="size" />
 				</dt>
 				<dd class="sidebar-dd">
-					<%= HtmlUtil.escape(TextFormatter.formatStorageSize(fileEntry.getSize(), locale)) %>
+					<%= HtmlUtil.escape(TextFormatter.formatStorageSize(fileVersion.getSize(), locale)) %>
 				</dd>
 				<dt class="sidebar-dt">
 					<liferay-ui:message key="modified" />