Changeset 7757

Timestamp:

Nov 27, 2019, 9:34:49 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

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

Started to re-implement the "View" and "Download" actions as extensions.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/FileViewerUtil.java (added)
• src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/ViewAndDownloadActionFactory.java (added)
• src/clients/web/web-extensions.xml (modified) (1 diff)
• www/common/datafiles/list_files.jsp (modified) (5 diffs)
• www/images/offline.png (added)

trunk/src/clients/web/web-extensions.xml

@@ -274 +274 @@
   </extension>
   
-  
+  <extension
+    id="view-and-download-file"
+    extends="net.sf.basedb.clients.web.file-viewer"
+    >
+    <index>1</index>
+    <about>
+      <name>View and download files</name>
+      <description>
+        Add view and download icons to all files.
+      </description>      
+    </about>
+    <action-factory>
+      <factory-class>
+        net.sf.basedb.clients.web.extensions.fileviewer.ViewAndDownloadActionFactory
+      </factory-class>
+    </action-factory>
+  </extension>
   
 </extensions>

trunk/www/common/datafiles/list_files.jsp

@@ -27 +27 @@
   import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.core.Item"
+  import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.ItemContext"
+  import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.Platform"
@@ -50 +52 @@
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.util.NameableComparator"
+  import="net.sf.basedb.util.extensions.ExtensionsInvoker"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
+  import="net.sf.basedb.clients.web.extensions.JspContext"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
   import="net.sf.basedb.util.Values"
   import="java.util.Map"
@@ -65 +72 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%@ taglib prefix="tbl" uri="/WEB-INF/table.tld" %>
+<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
 <%!
 
@@ -214 +222 @@
     }
   }
+  
+  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, new GuiContext(itemType, GuiContext.Type.ITEM), null);
+  FileViewerContext fileContext = FileViewerContext.dataFile((BasicItem)item);
+  FileViewerUtil fileViewer = new FileViewerUtil(jspContext, fileContext);
   %>
   <base:page type="include">
   <base:body>
+  <ext:scripts context="<%=jspContext%>" />
     <base:section 
       id="datafiles" 
@@ -353 +366 @@
                     visible="<%=file != null && file.isRemoved()%>"
                   />
-                  <%=Base.getLinkedFile(ID, file, !readFile, true, true, root)%>
+                  <%=Base.getLinkedName(ID, file, !readFile, true)%>
                   <%
+                  if (file != null)
+                  {
+                    fileContext.setCurrentDataFile(file, dft, member);
+                    fileViewer.render();
+                  }
                   if (parent != null)
                   {