Changeset 7762

Timestamp:

Nov 28, 2019, 7:40:54 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2199: Implement a "File viewer" extension point

Implemented in the item overview.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/overview/filter/NodeTypeFilter.java (added)
• www/common/overview/info.jsp (modified) (4 diffs)

trunk/www/common/overview/info.jsp

@@ -67 +67 @@
   import="net.sf.basedb.util.overview.Failure"
   import="net.sf.basedb.util.overview.Fix"
+  import="net.sf.basedb.util.overview.filter.NodeTypeFilter"
   import="net.sf.basedb.util.overview.extensions.ValidationRuleAction"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
   import="java.util.ArrayList"
   import="java.util.Date"
@@ -140 +143 @@
   Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
 
+  FileViewerContext fileContext = null;
+  FileViewerUtil fileViewer = null;
+  if (item instanceof FileSetMember)
+  {
+    Node parentNode = node.getFirstParent(new NodeTypeFilter(Node.Type.ITEM));
+    if (parentNode != null)
+    {
+      fileContext = FileViewerContext.dataFile(parentNode.getItem());
+    }
+  }
+  else if (item instanceof AnyToAny)
+  {
+    if (((AnyToAny)item).getToType() == Item.FILE)
+    {
+      Node parentNode = node.getFirstParent(new NodeTypeFilter(Node.Type.ITEM));
+      if (parentNode != null)
+      {
+        fileContext = FileViewerContext.anyToAny(parentNode.getItem());
+      }
+    }
+  }
+  if (fileContext != null)
+  {
+    fileViewer = new FileViewerUtil(jspContext, fileContext);
+  }
   %>
   <base:page title="" type="iframe">
@@ -203 +231 @@
         if (dft != null || file != null)
         {
+          if (file != null) fileContext.setCurrentDataFile(file, dft, member);
           %>
           <tr>
             <th><%=dft == null ? "Data file" : HTML.encodeTags(dft.getName())%></th>
             <td>
-              <%=Base.getLinkedFile(ID, file, deniedFile, true, true, "../../")%>
+              <%=Base.getLinkedName(ID, file, deniedFile, true)%>
+              <%if (file != null) fileViewer.render(); %>
             </td>
           </tr>
@@ -234 +264 @@
           linkTo = Base.getLink(ID, HTML.encodeTags(name), 
               to.getType(), to.getId(), to.hasPermission(Permission.WRITE));
+          if (fileViewer != null)
+          {
+            fileContext.setCurrentAnyToAny((File)to, any);
+            linkTo += " " + fileViewer.renderAsString();
+          }
         }
         catch (PermissionDeniedException ex)