Fixed comparation of extended attributes of type Document

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/MetadataDiff.java

@@ -117,10 +117,7 @@ public MetadataDiff(final GUIVersion version1, final GUIVersion version2) {
 
 		IButton compareContent = new IButton(I18N.message("comparecontent"));
 		compareContent.setWidth100();
-		compareContent.addClickHandler(event -> {
-			ComparisonWindow diff = new ComparisonWindow(version1, version2);
-			diff.show();
-		});
+		compareContent.addClickHandler(click -> new ComparisonWindow(version1, version2).show());
 		if (Feature.visible(Feature.COMPARISON)) {
 			addItem(compareContent);
 			compareContent.setDisabled(!Feature.enabled(Feature.COMPARISON));
@@ -135,9 +132,8 @@ private void printExtendedAttributes(ArrayList<DiffRecord> records, GUIVersion v
 
 		List<String> names = prepareAttributeNames(version1, version2);
 
-		for (String name : names) {
+		for (String name : names)
 			addDiffRecord(version1, version2, dateFormat, numberFormat, attributeRecords, name);
-		}
 
 		attributeRecords.sort(null);
 		records.addAll(attributeRecords);
@@ -175,7 +171,8 @@ private void addDiffRecord(GUIVersion version1, GUIVersion version2, DateTimeFor
 
 	private String extractValue(DateTimeFormat dateFormat, NumberFormat numberFormat, GUIAttribute attribute) {
 		String val = "";
-		if ((attribute.getType() == GUIAttribute.TYPE_STRING || attribute.getType() == GUIAttribute.TYPE_USER)
+		if ((attribute.getType() == GUIAttribute.TYPE_STRING || attribute.getType() == GUIAttribute.TYPE_USER
+				|| attribute.getType() == GUIAttribute.TYPE_DOCUMENT || attribute.getType() == GUIAttribute.TYPE_FOLDER)
 				&& attribute.getStringValue() != null) {
 			val = attribute.getStringValue();
 		} else if (attribute.getType() == GUIAttribute.TYPE_INT && attribute.getValue() != null) {

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/VersionsPanel.java

@@ -80,7 +80,7 @@ protected void onDraw() {
 		ListGridField permalink = preparePermalink();
 
 		ListGridField wfStatus = prepareWorkflow();
-				
+
 		list = new RefreshableListGrid(
 				new VersionsDS(document.getId(), null, Session.get().getConfigAsInt("gui.maxversions")));
 		list.setEmptyMessage(I18N.message("notitemstoshow"));
@@ -349,8 +349,7 @@ public void onFailure(Throwable caught) {
 
 					@Override
 					public void onSuccess(List<GUIVersion> result) {
-						MetadataDiff diffWinfow = new MetadataDiff(result.get(0), result.get(1));
-						diffWinfow.show();
+						new MetadataDiff(result.get(0), result.get(1)).show();
 					}
 				}));
 		return compareMetadata;