Code clean up and comments to doc renders and params for file-info [ref

#7081, #6685, #5210]
IQSS · Jan 26, 2021 · 191bdfc · 191bdfc
1 parent f46a87f
commit 191bdfc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -1056,10 +1056,7 @@ private boolean fileMetadataIsDifferent(FileMetadata fm1, FileMetadata fm2) {
         }
 
         // File restrictions
-        value1 = fm1.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public");
-        value2 = fm2.isRestricted() ? BundleUtil.getStringFromBundle("restricted") : BundleUtil.getStringFromBundle("public");
-
-        return !value1.equals(value2);
+        return fm1.isRestricted() != fm2.isRestricted();
     }
 
     private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, FileMetadata fm2) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
@@ -27,7 +27,7 @@
 
 public class UserNotification implements Serializable {
     public enum Type {
-        ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, SUBMITTEDDS, RETURNEDDS, PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, PUBLISHFAILED_PIDREG
+        ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, MAPLAYERUPDATED, MAPLAYERDELETEFAILED, SUBMITTEDDS, RETURNEDDS, PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, PUBLISHFAILED_PIDREG
     };
 
     private static final long serialVersionUID = 1L;

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
@@ -10,6 +10,21 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+
+    <ui:remove>
+    <!--
+    This fragment is included on... 
+    
+    - dataset pg, filesFragment, empty editMode render logic
+    - dataset pg AND file pg, (s3) package-download-popup-fragment
+    - editdatafiles (replace files) pg
+    
+    Parameters:
+    fileMetadata - object from containing page backing bean
+    editDatafilesPage - true if included on editdatafiles pg
+    -->            
+    </ui:remove>
+
     <p:outputPanel id="fileInfoInclude-filesTable" styleClass="media">
         <div class="media-left col-file-thumb" style="padding-top:4px;">
             <div class="media-object thumbnail-block text-center">

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -12,6 +12,15 @@
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     <o:importFunctions type="java.lang.Math" />
     <p:remoteCommand name="refreshPaginator" action="#{DatasetPage.refreshPaginator()}" process="@this" update="@form" />
+
+    <ui:remove>
+    <!--
+    This fragment is included only on the dataset pg, empty editMode render logic
+    
+    Parameters:
+    fileDownloadHelper - object from containing page backing bean
+    -->            
+    </ui:remove>
 
     <!-- Toggle Files Display Components -->
     <div jsf:id="filesDisplayToggleBlock" jsf:rendered="#{DatasetPage.fileTreeViewRequired}" class="row">