Changeset 7903

Timestamp:

Jan 25, 2021, 11:52:46 AM (11 months ago)

Author:

Nicklas Nordborg

Message:

Refereces #2237: Implement extension mechanism for query filtering

The RawBioassays table is now using a single JspContext instance for all extensions which makes it possible for a query filter extension to pass information to a column extension via context variables.

Location:

trunk/www/views/rawbioassays

Files:

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

trunk/www/views/rawbioassays/index.jsp

@@ -514 +514 @@
     final ItemQuery<RawBioAssay> query = RawBioAssay.getQuery();
     dc = sc.newDbControl();
+    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     cc.setQuery(query);
-    cc.configureQuery(dc, query, true);
+    cc.configureQuery(dc, query, jspContext, true);
     registerExportUtils(cc);
-    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     ExtensionsInvoker<ListColumnAction<RawBioAssay,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
     listInvoker.render(new ListColumnExportRenderer<RawBioAssay>(cc));
@@ -536 +536 @@
     final ItemQuery<RawBioAssay> query = RawBioAssay.getQuery();
     dc = sc.newDbControl();
-    cc.configureQuery(dc, query, true);
+    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
+    cc.configureQuery(dc, query, jspContext, true);
     dc.close();
     cc.setQuery(query);
@@ -553 +554 @@
     final ItemQuery<RawBioAssay> query = RawBioAssay.getQuery();
     dc = sc.newDbControl();
-    cc.configureQuery(dc, query, true);
+    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
+    cc.configureQuery(dc, query, jspContext, true);
     dc.close();
     cc.setQuery(query);

trunk/www/views/rawbioassays/list_rawbioassays.jsp

@@ -165 +165 @@
   Unit bytes = UnitUtil.getUnit(dc, Quantity.STORAGE_SIZE, "B");
   Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
+  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
   try
   {
-    final ItemQuery<RawBioAssay> query = Base.getConfiguredQuery(dc, cc, true, RawBioAssay.getQuery(), mode);
+    final ItemQuery<RawBioAssay> query = Base.getConfiguredQuery(dc, cc, jspContext, true, RawBioAssay.getQuery(), mode);
     rawBioAssays = query.iterate(dc);
   }
@@ -178 +179 @@
   Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
   int numListed = 0;
-  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
   ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
   ExtensionsInvoker<ListColumnAction<RawBioAssay,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);