Changeset 7852

Timestamp:

Oct 16, 2020, 2:34:11 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

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

Implemented a function for remembering the most recently used item types when adding a column. The most recent types are then displayed first in the selection list.

Location:

trunk/www/common/columns

Files:

• add_linkeditem_column.js (modified) (1 diff)
• add_linkeditem_column.jsp (modified) (4 diffs)
• ajax.jsp (modified) (2 diffs)

trunk/www/common/columns/add_linkeditem_column.js

@@ -55 +55 @@
     data.targetItemType = frm.targetItemType.value;
     data.property = '|'+data.linkName;
-    if (data.targetItemType) data.property += '|'+data.targetItemType;
+    if (data.targetItemType) 
+    {
+      data.property += '|'+data.targetItemType;
+      // Store the selected target type in "recently used" list
+      var url = 'ajax.jsp?ID='+App.getSessionId();
+      url += '&cmd=AddRecentlyUsedLinkTargetType&itemType='+encodeURIComponent(data.targetItemType);
+      var request = Ajax.getXmlHttpRequest();
+      request.open("POST", url, true);
+      request.send(null);
+    }
     data.title = data.linkName;
     Events.sendCustomEvent(window.opener.Doc.element('selectLinkedItemColumn'), 'base-selected', data);

trunk/www/common/columns/add_linkeditem_column.jsp

@@ -21 +21 @@
 
 --%>
-<%@page import="net.sf.basedb.core.Metadata"%>
 <%@ page pageEncoding="UTF-8" session="false"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.Item"
+  import="net.sf.basedb.core.ItemContext"
+  import="net.sf.basedb.core.Metadata"  
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="java.util.Arrays"
   import="java.util.List"
 %>
@@ -35 +37 @@
 final String ID = sc.getId();
 final Item itemType = Item.valueOf(request.getParameter("item_type"));
+final ItemContext cc = Base.getAndSetCurrentContext(sc, Item.ANYTOANY, null, null);
 %>
 <base:page type="popup" title="Add linked item column">
@@ -60 +63 @@
         <option value="">- any -
         <%
+        List<String> recentTypes = cc.getRecent("toTypes");
+        if (recentTypes.size() == 0)
+        {
+          recentTypes = Arrays.asList("FILE");
+        }
+        %>
+        <option value="0" disabled class="recentheader">- recently used -
+        <%
+        for (String r : recentTypes)
+        {
+          %>
+          <option value="<%=r%>"><%=r%>
+          <%
+        }
+        %>
+        <option value="0" disabled class="recentheader">- all -
+        <%
         for (Item targetItem : Metadata.getNameableItems())
         {
@@ -65 +85 @@
           {
             %>
-            <option value="<%=targetItem.name() %>"><%=targetItem.toString() %>
+            <option value="<%=targetItem.name() %>"><%=targetItem.name() %>
             <%
           }

trunk/www/common/columns/ajax.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Type"
   import="net.sf.basedb.core.ItemQuery"
+  import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.RawDataTypes"
@@ -165 +166 @@
     json.put("items", jsonLazy);
   }
+  else if ("AddRecentlyUsedLinkTargetType".equals(cmd))
+  {
+    ItemContext cc = Base.getAndSetCurrentContext(sc, Item.ANYTOANY, null, null);
+    cc.setRecent("toTypes", itemType.name(), Base.getMaxRecent(sc));
+    System.out.println("recently used:" + cc.getRecent("toTypes"));
+  }
   else
   {