Changeset 7851

Timestamp:

Oct 14, 2020, 2:23:30 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2222: Add support for manually adding any-to-any link column in table lists

Added a simple dialog for adding any-to-any columns. It is enabled on all lists by default and should be disabled in places were it is not supported (such as lists that mix different kinds of items).

Location:

trunk/www

Files:

• common/columns/add_linkeditem_column.js (added)
• common/columns/add_linkeditem_column.jsp (added)
• common/columns/configure.js (modified) (2 diffs)
• common/columns/configure.jsp (modified) (3 diffs)
• include/scripts/table.js (modified) (1 diff)
• include/styles/table.css (modified) (1 diff)
• my_base/projects/items/list_items.jsp (modified) (1 diff)
• views/items/list_items.jsp (modified) (1 diff)
• views/trashcan/list_trash.jsp (modified) (1 diff)

trunk/www/common/columns/configure.js

@@ -59 +59 @@
       Buttons.addClickHandler('selectRelatedItemColumn', configure.selectRelatedItemColumn);
       Events.addEventHandler('selectRelatedItemColumn', 'base-selected', configure.relatedItemColumnSelected);
+    }
+    if (Doc.element('selectLinkedItemColumn'))
+    {
+      Buttons.addClickHandler('selectLinkedItemColumn', configure.selectLinkedItemColumn);
+      Events.addEventHandler('selectLinkedItemColumn', 'base-selected', configure.linkedItemColumnSelected);
     }
     
@@ -235 +240 @@
       if (frm.visible[i].value == data.property) return;
     }
-
+    frm.visible[frm.visible.length] = new Option(data.title, data.property);
+  }
+  
+  configure.selectLinkedItemColumn = function(event)
+  {
+    var frm = document.forms['columns'];
+    var url = 'add_linkeditem_column.jsp?ID='+App.getSessionId();
+    url += '&item_type='+Data.get('page-data', 'item-type');
+    Dialogs.openPopup(url, 'SelectLinkedItemColumn', 600, 400);
+  }
+
+  configure.linkedItemColumnSelected = function(event)
+  {
+    var frm = document.forms['columns'];
+    var data = event.detail;
+    // Do not add duplicates
+    for (var i = 0; i < frm.visible.length; i++)
+    {
+      if (frm.visible[i].value == data.property) return;
+    }
     frm.visible[frm.visible.length] = new Option(data.title, data.property);
   }

trunk/www/common/columns/configure.jsp

@@ -55 +55 @@
 final boolean enableInheritedAnnotations = Values.getBoolean(request.getParameter("enableInheritedAnnotations"));
 final boolean enableRelatedItemColumns = Values.getBoolean(request.getParameter("enableRelatedItemColumns"));
+final boolean enableLinkedItemColumns = Values.getBoolean(request.getParameter("enableLinkedItemColumns"));
 final ItemContext cc = sc.getCurrentContext(itemType, subContext);
 
@@ -77 +78 @@
     <table style="width: 100%; height: 100%;">
     <%
-    if (enableInheritedAnnotations || enableRelatedItemColumns)
+    if (enableInheritedAnnotations || enableRelatedItemColumns || enableLinkedItemColumns)
     {
       %>
@@ -96 +97 @@
             tooltip="Add columns from parent or child items" 
             visible="<%=enableRelatedItemColumns %>"
+           />
+          <tbl:button 
+            id="selectLinkedItemColumn" 
+            image="add.png"
+            title="Add linked columns&hellip;" 
+            tooltip="Add columns from linked items" 
+            visible="<%=enableLinkedItemColumns %>"
            />
         </tbl:toolbar>

trunk/www/include/scripts/table.js

@@ -885 +885 @@
     var enableInheritedAnnotations = Data.get(tableDiv, 'inherited-annotations');
     var enableRelatedItemColumns = Data.get(tableDiv, 'relateditem-columns');
+    var disableLinkedItemColumns = Data.get(tableDiv, 'no-linkeditem-columns');
     
     var url = App.getRoot()+'common/columns/configure.jsp?ID='+App.getSessionId();
     url += '&table_id='+tableDiv.id+'&item_type='+itemType+'&subcontext='+subContext;
-    if (enableInheritedAnnotations)
-    {
-      url += '&enableInheritedAnnotations='+encodeURIComponent(enableInheritedAnnotations);
-    }
-    if (enableRelatedItemColumns)
-    {
-      url += '&enableRelatedItemColumns='+encodeURIComponent(enableRelatedItemColumns);
-    }
+    if (enableInheritedAnnotations) url += '&enableInheritedAnnotations=1';
+    if (enableRelatedItemColumns) url += '&enableRelatedItemColumns=1';
+    if (!disableLinkedItemColumns) url += '&enableLinkedItemColumns=1';
+
     if (settingName) url += '&settingName='+settingName;
     Dialogs.openPopup(url, 'ConfigureColumns', 750, 450);

trunk/www/include/styles/table.css

@@ -219 +219 @@
 }
 
+/* A column header defining a linked item value */
+.itemlist div.data th.linkeditemcol::before
+{
+  margin-right: 2px;
+  float: left;
+  content: '›';
+  color: #999999;
+}
 
 /* Place property filters */

trunk/www/my_base/projects/items/list_items.jsp

@@ -163 +163 @@
       subcontext="<%=subContext%>"
       subclass="fulltable"
+      data-no-linkeditem-columns="1"
       >
       <tbl:hidden

trunk/www/views/items/list_items.jsp

@@ -150 +150 @@
       subcontext="<%=subContext%>"
       subclass="fulltable"
+      data-no-linkeditem-columns="1"
       >
       <tbl:columndef

trunk/www/views/trashcan/list_trash.jsp

@@ -150 +150 @@
       subcontext="<%=subContext%>"
       subclass="fulltable"
+      data-no-linkeditem-columns="1"
       >
       <tbl:columndef