#3758 remove transient display order

was used for tab
IQSS · Oct 29, 2019 · 0700b24 · 0700b24
1 parent 939de9d
commit 0700b24
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -249,14 +249,6 @@ private List<ExternalTool> addMapLayerAndSortExternalTools(){
         }
         Collections.sort(retList, CompareExternalToolName);
 
-        if(retList.size() > 1){
-            int order = 0;
-            for (ExternalTool t: retList){
-                t.setDisplayOrder(order);
-                order++;
-            }
-        }
-
         return retList;
     }
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java
@@ -11,7 +11,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Transient;
 
 /**
  * A specification or definition for how an external tool is intended to
@@ -81,18 +80,6 @@ public class ExternalTool implements Serializable {
 
     @Column(nullable = false)
     private boolean hasPreviewMode;   
-
-    @Transient 
-    private int displayOrder;
-
-    public int getDisplayOrder() {
-        return displayOrder;
-    }
-
-    public void setDisplayOrder(int displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-
 
     /**
      * This default constructor is only here to prevent this error at

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -390,9 +390,7 @@
                                             <!-- #file-preview-icon-block > #border-block > #preview-square PADDING-BOTTOM: 100% -->
                                         </div>
                                     </div>
-                                    <div jsf:rendered="#{(FilePage.toolsWithPreviews.size() > 0) and !FilePage.publiclyDownloadable }"> 
-                                        <h:outputText  value="#{bundle['file.previewTab.previews.not.available']}" />
-                                    </div>
+                                    <h:outputText  value="#{bundle['file.previewTab.previews.not.available']}" />
                                 </div>
                                 <!-- Add external tools as an inner tab with buttons to full tool-->
                                 <div jsf:rendered="#{FilePage.publiclyDownloadable}">