Changeset 4374

Timestamp:

Jul 4, 2008, 12:14:19 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1046: Remember closed/expanded node status in the hierarchical tree of Bioassay sets

Also remembered between sessions.

Location:

trunk/www/views/experiments/bioassaysets

Files:

• analysis_tree.jsp (modified) (2 diffs)
• index.jsp (modified) (3 diffs)

trunk/www/views/experiments/bioassaysets/analysis_tree.jsp

@@ -408 +408 @@
       Table.presetOnChange('<%=ID%>', formId, '<%=itemType.name()%>', '<%=(String)cc.getObject("defaultColumns")%>');
     }
+    
+    function sendClosedWithAjax()
+    {
+      var request = Main.getAjaxRequest();
+      if (request != null)
+      {
+        var frm = document.forms[formId];
+        var url = '../bioassaysets/index.jsp?ID=<%=ID%>&cmd=SetClosedWithAjax';
+        request.open("POST", url, true);
+        var postdata = 'closed=' + frm.closed.value;
+        request.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        request.setRequestHeader("Content-length", postdata.length);
+        request.setRequestHeader("Connection", "close");
+        request.send(postdata);
+      }
+    }
+    
     function initTree()
     {
@@ -435 +452 @@
           frm.closed.value += menuItem.externalId+',';
         }
+        sendClosedWithAjax();
         // alert(document.forms[formId].closed.value);
         this.updateIconsAndText(menuItemIndex);

trunk/www/views/experiments/bioassaysets/index.jsp

@@ -77 +77 @@
   {
     String closed = request.getParameter("closed");
+    if (closed == null && cc.getSetting("closed") != null && cc.getObject("closed") == null)
+    {
+      closed = (String)cc.getSetting("closed");
+    }
     if (closed != null)
     {
+      cc.setSetting("closed", closed);
       cc.setObject("closed", new HashSet<String>(Arrays.asList(closed.split(","))));
     }
@@ -117 +122 @@
     // Display the list page without updatinging the current context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext, true);
+    setClosed(request, cc);
     if (transformationId != null)
     {
@@ -361 +367 @@
     redirect = "../../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&main_type=ANALYZE&title=Filter+bioassay+set&plugin_type=net.sf.basedb.core.plugin.AnalysisFilterPlugin";
   }
+  else if ("SetClosedWithAjax".equals(cmd))
+  {
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    setClosed(request, cc);
+    return;
+  }
   else
   {