Changeset 4619

Timestamp:

Oct 30, 2008, 2:35:53 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1129: Filtering of child/parent items in table listing

Remove debug code belonging to #1145 (Raw data batch import) that was checked in by accident in [4613].

Location:

trunk/www/views/experiments

Files:

• index.jsp (modified) (1 diff)
• view_experiment.jsp (modified) (2 diffs)

trunk/www/views/experiments/index.jsp

@@ -341 +341 @@
     redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&main_type=OTHER&title=Run+plugin";
   }
-  else if ("DeleteAllRawData".equals(cmd))
-  {
-    dc = sc.newDbControl();
-    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    Experiment exp = Experiment.getById(dc, cc.getId());
-    List<RawBioAssay> all = new ArrayList<RawBioAssay>(exp.getRawBioAssays().list(dc));
-    for (RawBioAssay rba : all)
-    {
-      exp.removeRawBioAssay(rba);
-    }
-    dc.commit();
-    
-    dc = sc.newDbControl();
-    for (RawBioAssay rba : all)
-    {
-      rba = RawBioAssay.getById(dc, rba.getId());
-      rba.deleteRawData();
-    }
-    dc.commit();
-    
-    dc = sc.newDbControl();
-    exp = Experiment.getById(dc, cc.getId());
-    for (RawBioAssay rba : all)
-    {
-      exp.addRawBioAssay(rba);
-    }
-    dc.commit();
-    redirect = viewPage;
-  }
   else
   {

trunk/www/views/experiments/view_experiment.jsp

@@ -148 +148 @@
       location.href = '<%=root%>/analyze/index.jsp?ID=<%=ID%>&experiment_id=<%=itemId%>';
     }
-    function deleteAllRaw()
-    {
-      location.href = 'index.jsp?ID=<%=ID%>&cmd=DeleteAllRawData&item_id=<%=itemId%>';
-    }
     function viewBioAssaySets()
     {
@@ -275 +271 @@
         title="Help&hellip;"
         tooltip="Get help about this page"
-      />
-      <tbl:button
-        onclick="deleteAllRaw()"
-        title="Delete all raw data"
       />
       </tbl:toolbar>