Changeset 7440

Timestamp:

Jan 25, 2018, 1:53:46 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2106: Add support for custom list columns in any-to-any lists

A side-effect of the implementation is that it is also possible to add custom buttons to the toolbar.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/toolbar/ToolbarUtil.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/taglib/table/ColumnDef.java (modified) (2 diffs)
• www/common/anytoany/list_anytoany.jsp (modified) (5 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/toolbar/ToolbarUtil.java

@@ -79 +79 @@
       Item.SESSION, Item.JOB, Item.MESSAGE, Item.PROJECT, Item.FILE, Item.FILESERVER,
       Item.CHANGEHISTORY, Item.PERMISSIONTEMPLATE, Item.ITEMSUBTYPE, Item.ITEMLIST,
-      Item.USERDEVICE
+      Item.USERDEVICE, Item.ANYTOANY
     };
 

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/ColumnDef.java

@@ -659 +659 @@
       boolean isPermission = "permission".equals(getId()); // requires special handling
       boolean isFilterable = (isFilterable() || isPermission) && table.getSc() != null &&  table.getItem() != null;
+      boolean isSortable = isSortable() && table.getSc() != null &&  table.getItem() != null;
       boolean isVisible = table.isColumnVisible(getId());
       boolean hasFilter = false;
@@ -697 +698 @@
           sb.append("></span>");
         }
-        if (!isSortable())
+        if (!isSortable)
         {
           String theTooltip = getTooltip() != null ? getTooltip() : getTitle();

trunk/www/common/anytoany/list_anytoany.jsp

@@ -42 +42 @@
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.plugin.GuiContext"
+  import="net.sf.basedb.util.Values"
+  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.Values"
+  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
+  import="net.sf.basedb.clients.web.extensions.JspContext"
+  import="net.sf.basedb.clients.web.extensions.toolbar.ToolbarUtil"
+  import="net.sf.basedb.clients.web.extensions.list.ListColumnUtil"
+  import="net.sf.basedb.clients.web.extensions.renderer.PrefixSuffixRenderer"
   import="java.util.List"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%@ taglib prefix="tbl" uri="/WEB-INF/table.tld" %>
-
+<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
 <%
 String root = request.getContextPath() + "/";
@@ -71 +78 @@
   ItemResultList<AnyToAny> links = query.list(dc);
   long count = links.getTotalCount();
+  
+  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, new GuiContext(Item.ANYTOANY, GuiContext.Type.LIST), item);
+  ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
+  ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
   <base:page type="include">
@@ -97 +108 @@
             id="description"
             title="Description"
+          />
+          <tbl:columndef 
+            id="xt-columns" 
+            extensions="<%=columnsInvoker%>" 
+            jspcontext="<%=jspContext%>" 
           />
           <tbl:toolbar
@@ -118 +134 @@
               disabled="<%=!deletePermission%>"
             />
+            <ext:render extensions="<%=invoker%>" context="<%=jspContext%>" 
+              wrapper="<%=new PrefixSuffixRenderer(jspContext, "<td>", "</td>") %>"/>
           </tbl:toolbar>
           <tbl:data>
@@ -220 +238 @@
                   <%=toLink%></tbl:cell>
                 <tbl:cell column="description"><%=HTML.niceFormat(ata.getDescription())%></tbl:cell>
+                <tbl:xt-cells dc="<%=dc%>" item="<%=ata%>">
+                  <tbl:cell column="xt-columns" />
+                </tbl:xt-cells>
               </tbl:row>
               <%