Changeset 7914


Ignore:
Timestamp:
Feb 23, 2021, 8:23:26 AM (9 months ago)
Author:
Nicklas Nordborg
Message:

References #2237: Implement extension mechanism for query filtering

This should now work on all list pages.

Location:
trunk/www
Files:
142 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/admin/annotationtypecategories/index.jsp

    r7605 r7914  
    308308    final ItemQuery<AnnotationTypeCategory> query = AnnotationTypeCategory.getQuery();
    309309    dc = sc.newDbControl();
    310     cc.configureQuery(dc, query, true);
     310    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     311    cc.configureQuery(dc, query, jspContext, true);
    311312    cc.setQuery(query);
    312313    registerExportUtils(cc);
    313     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    314314    ExtensionsInvoker<ListColumnAction<AnnotationTypeCategory,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    315315    listInvoker.render(new ListColumnExportRenderer<AnnotationTypeCategory>(cc));
    … …  
    330330    final ItemQuery<AnnotationTypeCategory> query = AnnotationTypeCategory.getQuery();
    331331    dc = sc.newDbControl();
    332     cc.configureQuery(dc, query, true);
     332    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     333    cc.configureQuery(dc, query, jspContext, true);
    333334    dc.close();
    334335    cc.setQuery(query);
    … …  
    347348    final ItemQuery<AnnotationTypeCategory> query = AnnotationTypeCategory.getQuery();
    348349    dc = sc.newDbControl();
    349     cc.configureQuery(dc, query, true);
     350    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     351    cc.configureQuery(dc, query, jspContext, true);
    350352    dc.close();
    351353    cc.setQuery(query);

  • trunk/www/admin/annotationtypecategories/list_categories.jsp

    r7913 r7914  
    9999
    100100  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     101  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    101102  try
    102103  {
    103104    final ItemQuery<AnnotationTypeCategory> query =
    104       Base.getConfiguredQuery(dc, cc, true, AnnotationTypeCategory.getQuery(), mode);
     105      Base.getConfiguredQuery(dc, cc, jspContext, true, AnnotationTypeCategory.getQuery(), mode);
    105106    annotationTypeCategories = query.iterate(dc);
    106107  }
    … …  
    110111  }
    111112  int numListed = 0;
    112   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    113113  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    114114  ExtensionsInvoker<ListColumnAction<AnnotationTypeCategory,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/annotationtypes/index.jsp

    r7616 r7914  
    452452    final ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
    453453    dc = sc.newDbControl();
    454     cc.configureQuery(dc, query, true);
     454    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     455    cc.configureQuery(dc, query, jspContext, true);
    455456    cc.setQuery(query);
    456457    registerExportUtils(cc);
    457     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    458458    ExtensionsInvoker<ListColumnAction<AnnotationType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    459459    listInvoker.render(new ListColumnExportRenderer<AnnotationType>(cc));
    … …  
    474474    final ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
    475475    dc = sc.newDbControl();
    476     cc.configureQuery(dc, query, true);
     476    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     477    cc.configureQuery(dc, query, jspContext, true);
    477478    dc.close();
    478479    cc.setQuery(query);
    … …  
    491492    final ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
    492493    dc = sc.newDbControl();
    493     cc.configureQuery(dc, query, true);
     494    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     495    cc.configureQuery(dc, query, jspContext, true);
    494496    dc.close();
    495497    cc.setQuery(query);

  • trunk/www/admin/annotationtypes/list_annotationtypes.jsp

    r7913 r7914  
    121121
    122122  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     123  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    123124  try
    124125  {
    125     final ItemQuery<AnnotationType> query = Base.getConfiguredQuery(dc, cc, true, AnnotationType.getQuery(null), mode);
     126    final ItemQuery<AnnotationType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, AnnotationType.getQuery(null), mode);
    126127    annotationTypes = query.iterate(dc);
    127128  }
    … …  
    131132  }
    132133  int numListed = 0;
    133   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    134134  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    135135  ExtensionsInvoker<ListColumnAction<AnnotationType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/clients/help/index.jsp

    r7605 r7914  
    196196    final Client client = Client.getById(dc, clientId);
    197197    final ItemQuery<Help> query = client.getHelp();
    198     cc.configureQuery(dc, query, true);
     198    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     199    cc.configureQuery(dc, query, jspContext, true);
    199200    cc.setQuery(query);
    200     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    201201    ExtensionsInvoker<ListColumnAction<Help,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    202202    listInvoker.render(new ListColumnExportRenderer<Help>(cc));
    … …  
    217217    final Client client = Client.getById(dc, clientId);
    218218    final ItemQuery<Help> query = client.getHelp();
    219     cc.configureQuery(dc, query, true);
     219    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     220    cc.configureQuery(dc, query, jspContext, true);
    220221    dc.close();
    221222    cc.setQuery(query);
    … …  
    235236    final Client client = Client.getById(dc, clientId);
    236237    final ItemQuery<Help> query = client.getHelp();
    237     cc.configureQuery(dc, query, true);
     238    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     239    cc.configureQuery(dc, query, jspContext, true);
    238240    dc.close();
    239241    cc.setQuery(query);

  • trunk/www/admin/clients/help/list_help.jsp

    r7913 r7914  
    8686
    8787  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     88  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, client);
    8889  try
    8990  {
    90     final ItemQuery<Help> query = Base.getConfiguredQuery(dc, cc, true, client.getHelp(), mode);
     91    final ItemQuery<Help> query = Base.getConfiguredQuery(dc, cc, jspContext, true, client.getHelp(), mode);
    9192    help = query.iterate(dc);
    9293  }
    … …  
    9697  }
    9798  int numListed = 0;
    98   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, client);
    9999  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    100100  ExtensionsInvoker<ListColumnAction<Help,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/clients/index.jsp

    r7605 r7914  
    267267    final ItemQuery<Client> query = Client.getQuery();
    268268    dc = sc.newDbControl();
    269     cc.configureQuery(dc, query, true);
     269    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     270    cc.configureQuery(dc, query, jspContext, true);
    270271    cc.setQuery(query);
    271     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    272272    ExtensionsInvoker<ListColumnAction<Client,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    273273    listInvoker.render(new ListColumnExportRenderer<Client>(cc));
    … …  
    287287    final ItemQuery<Client> query = Client.getQuery();
    288288    dc = sc.newDbControl();
    289     cc.configureQuery(dc, query, true);
     289    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     290    cc.configureQuery(dc, query, jspContext, true);
    290291    dc.close();
    291292    cc.setQuery(query);
    … …  
    304305    final ItemQuery<Client> query = Client.getQuery();
    305306    dc = sc.newDbControl();
    306     cc.configureQuery(dc, query, true);
     307    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     308    cc.configureQuery(dc, query, jspContext, true);
    307309    dc.close();
    308310    cc.setQuery(query);

  • trunk/www/admin/clients/list_clients.jsp

    r7913 r7914  
    8686
    8787  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     88  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8889  try
    8990  {
    90     final ItemQuery<Client> query = Base.getConfiguredQuery(dc, cc, true, Client.getQuery(), mode);
     91    final ItemQuery<Client> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Client.getQuery(), mode);
    9192    clients = query.iterate(dc);
    9293  }
    … …  
    9697  }
    9798  int numListed = 0;
    98   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9999  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    100100  ExtensionsInvoker<ListColumnAction<Client,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/datafiletypes/index.jsp

    r7703 r7914  
    232232    final ItemQuery<DataFileType> query = DataFileType.getQuery();
    233233    dc = sc.newDbControl();
    234     cc.configureQuery(dc, query, true);
     234    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     235    cc.configureQuery(dc, query, jspContext, true);
    235236    cc.setQuery(query);
    236     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    237237    ExtensionsInvoker<ListColumnAction<DataFileType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    238238    listInvoker.render(new ListColumnExportRenderer<DataFileType>(cc));
    … …  
    252252    final ItemQuery<DataFileType> query = DataFileType.getQuery();
    253253    dc = sc.newDbControl();
    254     cc.configureQuery(dc, query, true);
     254    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     255    cc.configureQuery(dc, query, jspContext, true);
    255256    dc.close();
    256257    cc.setQuery(query);
    … …  
    269270    final ItemQuery<DataFileType> query = DataFileType.getQuery();
    270271    dc = sc.newDbControl();
    271     cc.configureQuery(dc, query, true);
     272    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     273    cc.configureQuery(dc, query, jspContext, true);
    272274    dc.close();
    273275    cc.setQuery(query);

  • trunk/www/admin/datafiletypes/list_filetypes.jsp

    r7913 r7914  
    122122
    123123  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     124  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    124125  try
    125126  {
    126     final ItemQuery<DataFileType> query = Base.getConfiguredQuery(dc, cc, true, DataFileType.getQuery(), mode);
     127    final ItemQuery<DataFileType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, DataFileType.getQuery(), mode);
    127128    fileTypes = query.iterate(dc);
    128129  }
    … …  
    132133  }
    133134  int numListed = 0;
    134   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    135135  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    136136  ExtensionsInvoker<ListColumnAction<DataFileType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/diskusage/details/view_details.jsp

    r7605 r7914  
    139139  long totalCount = 0;
    140140  int numListed = 0;
     141  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
     142      GuiContext.list(Item.DISKUSAGE), user == null ? group : user);
    141143  try
    142144  {
    143     final ItemQuery<DiskUsage> query = Base.getConfiguredQuery(dc, cc, true, DiskUsage.getQuery(user, group), null);
     145    final ItemQuery<DiskUsage> query = Base.getConfiguredQuery(dc, cc, jspContext, true, DiskUsage.getQuery(user, group), null);
    144146    diskUsage = query.iterate(dc);
    145147    totalCount = diskUsage.getTotalCount();
    … …  
    149151    cc.setMessage(t.getMessage());
    150152  }
    151   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
    152       GuiContext.list(Item.DISKUSAGE), user == null ? group : user);
    153153  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    154154  %>

  • trunk/www/admin/diskusage/list_groups.jsp

    r7913 r7914  
    9999  List<QuotaType> quotaTypes = du.getQuotaTypes();
    100100 
     101  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    101102  try
    102103  {
    103     final ItemQuery<Group> query = Base.getConfiguredQuery(dc, cc, true, Group.getQuery(), mode);
     104    final ItemQuery<Group> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Group.getQuery(), mode);
    104105    query.include(Include.ALL);
    105106    query.restrict(
    … …  
    113114  }
    114115  int numListed = 0;
    115   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    116116  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    117117  ExtensionsInvoker<ListColumnAction<Group,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/diskusage/list_users.jsp

    r7913 r7914  
    102102  List<QuotaType> quotaTypes = du.getQuotaTypes();
    103103 
     104  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    104105  try
    105106  {
    106     final ItemQuery<User> query = Base.getConfiguredQuery(dc, cc, true, User.getQuery(), mode);
     107    final ItemQuery<User> query = Base.getConfiguredQuery(dc, cc, jspContext, true, User.getQuery(), mode);
    107108    query.include(Include.ALL);
    108109    users = query.iterate(dc);
    … …  
    113114  }
    114115  int numListed = 0;
    115   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    116116  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    117117  ExtensionsInvoker<ListColumnAction<User,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/extravaluetypes/index.jsp

    r7605 r7914  
    231231    final ItemQuery<ExtraValueType> query = ExtraValueType.getQuery();
    232232    dc = sc.newDbControl();
    233     cc.configureQuery(dc, query, true);
     233    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     234    cc.configureQuery(dc, query, jspContext, true);
    234235    cc.setQuery(query);
    235     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    236236    ExtensionsInvoker<ListColumnAction<ExtraValueType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    237237    listInvoker.render(new ListColumnExportRenderer<ExtraValueType>(cc));
    … …  
    251251    final ItemQuery<ExtraValueType> query = ExtraValueType.getQuery();
    252252    dc = sc.newDbControl();
    253     cc.configureQuery(dc, query, true);
     253    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     254    cc.configureQuery(dc, query, jspContext, true);
    254255    dc.close();
    255256    cc.setQuery(query);
    … …  
    268269    final ItemQuery<ExtraValueType> query = ExtraValueType.getQuery();
    269270    dc = sc.newDbControl();
    270     cc.configureQuery(dc, query, true);
     271    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     272    cc.configureQuery(dc, query, jspContext, true);
    271273    dc.close();
    272274    cc.setQuery(query);

  • trunk/www/admin/extravaluetypes/list_extravaluetypes.jsp

    r7913 r7914  
    100100  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    101101  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     102  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    102103  try
    103104  {
    104     final ItemQuery<ExtraValueType> query = Base.getConfiguredQuery(dc, cc, true, ExtraValueType.getQuery(), mode);
     105    final ItemQuery<ExtraValueType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ExtraValueType.getQuery(), mode);
    105106    extraValueTypes = query.iterate(dc);
    106107  }
    … …  
    110111  }
    111112  int numListed = 0;
    112   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    113113  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    114114  ExtensionsInvoker<ListColumnAction<ExtraValueType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/groups/index.jsp

    r7605 r7914  
    289289    final ItemQuery<Group> query = Group.getQuery();
    290290    dc = sc.newDbControl();
    291     cc.configureQuery(dc, query, true);
     291    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     292    cc.configureQuery(dc, query, jspContext, true);
    292293    cc.setQuery(query);
    293294    registerExportUtils(cc);
    294     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    295295    ExtensionsInvoker<ListColumnAction<Group,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    296296    listInvoker.render(new ListColumnExportRenderer<Group>(cc));
    … …  
    311311    final ItemQuery<Group> query = Group.getQuery();
    312312    dc = sc.newDbControl();
    313     cc.configureQuery(dc, query, true);
     313    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     314    cc.configureQuery(dc, query, jspContext, true);
    314315    dc.close();
    315316    cc.setQuery(query);
    … …  
    328329    final ItemQuery<Group> query = Group.getQuery();
    329330    dc = sc.newDbControl();
    330     cc.configureQuery(dc, query, true);
     331    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     332    cc.configureQuery(dc, query, jspContext, true);
    331333    dc.close();
    332334    cc.setQuery(query);

  • trunk/www/admin/groups/list_groups.jsp

    r7913 r7914  
    102102
    103103  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     104  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    104105  try
    105106  {
    106     final ItemQuery<Group> query = Base.getConfiguredQuery(dc, cc, true, Group.getQuery(), mode);
     107    final ItemQuery<Group> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Group.getQuery(), mode);
    107108    groups = query.iterate(dc);
    108109  }
    … …  
    112113  }
    113114  int numListed = 0;
    114   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    115115  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    116116  ExtensionsInvoker<ListColumnAction<Group,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/hardware/index.jsp

    r7703 r7914  
    292292    final ItemQuery<Hardware> query = Hardware.getQuery();
    293293    dc = sc.newDbControl();
    294     cc.configureQuery(dc, query, true);
     294    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     295    cc.configureQuery(dc, query, jspContext, true);
    295296    cc.setQuery(query);
    296     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    297297    ExtensionsInvoker<ListColumnAction<Hardware,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    298298    listInvoker.render(new ListColumnExportRenderer<Hardware>(cc));
    … …  
    312312    final ItemQuery<Hardware> query = Hardware.getQuery();
    313313    dc = sc.newDbControl();
    314     cc.configureQuery(dc, query, true);
     314    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     315    cc.configureQuery(dc, query, jspContext, true);
    315316    dc.close();
    316317    cc.setQuery(query);
    … …  
    329330    final ItemQuery<Hardware> query = Hardware.getQuery();
    330331    dc = sc.newDbControl();
    331     cc.configureQuery(dc, query, true);
     332    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     333    cc.configureQuery(dc, query, jspContext, true);
    332334    dc.close();
    333335    cc.setQuery(query);

  • trunk/www/admin/hardware/list_hardware.jsp

    r7913 r7914  
    106106
    107107  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     108  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108109  try
    109110  {
    110     final ItemQuery<Hardware> query = Base.getConfiguredQuery(dc, cc, true, Hardware.getQuery(), mode);
     111    final ItemQuery<Hardware> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Hardware.getQuery(), mode);
    111112    hardware = query.iterate(dc);
    112113  }
    … …  
    116117  }
    117118  int numListed = 0;
    118   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    119119  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    120120  ExtensionsInvoker<ListColumnAction<Hardware,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/itemsubtypes/index.jsp

    r7605 r7914  
    290290    final ItemQuery<ItemSubtype> query = ItemSubtype.getQuery(null);
    291291    dc = sc.newDbControl();
    292     cc.configureQuery(dc, query, true);
     292    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     293    cc.configureQuery(dc, query, jspContext, true);
    293294    cc.setQuery(query);
    294295    registerExportUtils(cc);
    295     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    296296    ExtensionsInvoker<ListColumnAction<ItemSubtype,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    297297    listInvoker.render(new ListColumnExportRenderer<ItemSubtype>(cc));
    … …  
    312312    final ItemQuery<ItemSubtype> query = ItemSubtype.getQuery(null);
    313313    dc = sc.newDbControl();
    314     cc.configureQuery(dc, query, true);
     314    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     315    cc.configureQuery(dc, query, jspContext, true);
    315316    dc.close();
    316317    cc.setQuery(query);
    … …  
    329330    final ItemQuery<ItemSubtype> query = ItemSubtype.getQuery(null);
    330331    dc = sc.newDbControl();
    331     cc.configureQuery(dc, query, true);
     332    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     333    cc.configureQuery(dc, query, jspContext, true);
    332334    dc.close();
    333335    cc.setQuery(query);

  • trunk/www/admin/itemsubtypes/list_subtypes.jsp

    r7913 r7914  
    110110
    111111  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     112  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    112113  try
    113114  {
    114     final ItemQuery<ItemSubtype> query = Base.getConfiguredQuery(dc, cc, true, ItemSubtype.getQuery(null), mode);
     115    final ItemQuery<ItemSubtype> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ItemSubtype.getQuery(null), mode);
    115116    subtypes = query.iterate(dc);
    116117  }
    … …  
    121122  }
    122123  int numListed = 0;
    123   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    124124  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    125125  ExtensionsInvoker<ListColumnAction<ItemSubtype,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/jobagents/index.jsp

    r7605 r7914  
    309309    final ItemQuery<JobAgent> query = JobAgent.getQuery();
    310310    dc = sc.newDbControl();
    311     cc.configureQuery(dc, query, true);
     311    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     312    cc.configureQuery(dc, query, jspContext, true);
    312313    cc.setQuery(query);
    313     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    314314    ExtensionsInvoker<ListColumnAction<JobAgent,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    315315    listInvoker.render(new ListColumnExportRenderer<JobAgent>(cc));
    … …  
    329329    final ItemQuery<JobAgent> query = JobAgent.getQuery();
    330330    dc = sc.newDbControl();
    331     cc.configureQuery(dc, query, true);
     331    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     332    cc.configureQuery(dc, query, jspContext, true);
    332333    dc.close();
    333334    cc.setQuery(query);
    … …  
    346347    final ItemQuery<JobAgent> query = JobAgent.getQuery();
    347348    dc = sc.newDbControl();
    348     cc.configureQuery(dc, query, true);
     349    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     350    cc.configureQuery(dc, query, jspContext, true);
    349351    dc.close();
    350352    cc.setQuery(query);

  • trunk/www/admin/jobagents/list_agents.jsp

    r7913 r7914  
    9393 
    9494  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     95  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9596  try
    9697  {
    97     final ItemQuery<JobAgent> query = Base.getConfiguredQuery(dc, cc, true, JobAgent.getQuery(), mode);
     98    final ItemQuery<JobAgent> query = Base.getConfiguredQuery(dc, cc, jspContext, true, JobAgent.getQuery(), mode);
    9899    agents = query.iterate(dc);
    99100  }
    … …  
    103104  }
    104105  int numListed = 0;
    105   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    106106  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    107107  ExtensionsInvoker<ListColumnAction<JobAgent,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/mimetypes/index.jsp

    r7703 r7914  
    230230    final ItemQuery<MimeType> query = MimeType.getQuery();
    231231    dc = sc.newDbControl();
    232     cc.configureQuery(dc, query, true);
     232    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     233    cc.configureQuery(dc, query, jspContext, true);
    233234    cc.setQuery(query);
    234     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    235235    ExtensionsInvoker<ListColumnAction<MimeType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    236236    listInvoker.render(new ListColumnExportRenderer<MimeType>(cc));
    … …  
    250250    final ItemQuery<MimeType> query = MimeType.getQuery();
    251251    dc = sc.newDbControl();
    252     cc.configureQuery(dc, query, true);
     252    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     253    cc.configureQuery(dc, query, jspContext, true);
    253254    dc.close();
    254255    cc.setQuery(query);
    … …  
    267268    final ItemQuery<MimeType> query = MimeType.getQuery();
    268269    dc = sc.newDbControl();
    269     cc.configureQuery(dc, query, true);
     270    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     271    cc.configureQuery(dc, query, jspContext, true);
    270272    dc.close();
    271273    cc.setQuery(query);

  • trunk/www/admin/mimetypes/list_mimetypes.jsp

    r7913 r7914  
    9191
    9292  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     93  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9394  try
    9495  {
    95     final ItemQuery<MimeType> query = Base.getConfiguredQuery(dc, cc, true, MimeType.getQuery(), mode);
     96    final ItemQuery<MimeType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, MimeType.getQuery(), mode);
    9697    mimeTypes = query.iterate(dc);
    9798  }
    … …  
    101102  }
    102103  int numListed = 0;
    103   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    104104  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    105105  ExtensionsInvoker<ListColumnAction<MimeType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/news/index.jsp

    r7605 r7914  
    238238    final ItemQuery<News> query = News.getQuery();
    239239    dc = sc.newDbControl();
    240     cc.configureQuery(dc, query, true);
     240    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     241    cc.configureQuery(dc, query, jspContext, true);
    241242    cc.setQuery(query);
    242     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    243243    ExtensionsInvoker<ListColumnAction<News,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    244244    listInvoker.render(new ListColumnExportRenderer<News>(cc));
    … …  
    258258    final ItemQuery<News> query = News.getQuery();
    259259    dc = sc.newDbControl();
    260     cc.configureQuery(dc, query, true);
     260    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     261    cc.configureQuery(dc, query, jspContext, true);
    261262    dc.close();
    262263    cc.setQuery(query);
    … …  
    275276    final ItemQuery<News> query = News.getQuery();
    276277    dc = sc.newDbControl();
    277     cc.configureQuery(dc, query, true);
     278    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     279    cc.configureQuery(dc, query, jspContext, true);
    278280    dc.close();
    279281    cc.setQuery(query);

  • trunk/www/admin/news/list_news.jsp

    r7913 r7914  
    8484
    8585  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     86  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8687  try
    8788  {
    88     final ItemQuery<News> query = Base.getConfiguredQuery(dc, cc, true, News.getQuery(), mode);
     89    final ItemQuery<News> query = Base.getConfiguredQuery(dc, cc, jspContext, true, News.getQuery(), mode);
    8990    news = query.iterate(dc);
    9091  }
    … …  
    9596  int numListed = 0;
    9697  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    97   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9898  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9999  ExtensionsInvoker<ListColumnAction<News,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/platforms/index.jsp

    r7605 r7914  
    280280    final ItemQuery<Platform> query = Platform.getQuery();
    281281    dc = sc.newDbControl();
    282     cc.configureQuery(dc, query, true);
     282    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     283    cc.configureQuery(dc, query, jspContext, true);
    283284    cc.setQuery(query);
    284285    registerExportUtils(cc);
    285     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    286286    ExtensionsInvoker<ListColumnAction<Platform,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    287287    listInvoker.render(new ListColumnExportRenderer<Platform>(cc));
    … …  
    302302    final ItemQuery<Platform> query = Platform.getQuery();
    303303    dc = sc.newDbControl();
    304     cc.configureQuery(dc, query, true);
     304    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     305    cc.configureQuery(dc, query, jspContext, true);
    305306    dc.close();
    306307    cc.setQuery(query);
    … …  
    319320    final ItemQuery<Platform> query = Platform.getQuery();
    320321    dc = sc.newDbControl();
    321     cc.configureQuery(dc, query, true);
     322    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     323    cc.configureQuery(dc, query, jspContext, true);
    322324    dc.close();
    323325    cc.setQuery(query);

  • trunk/www/admin/platforms/list_platforms.jsp

    r7913 r7914  
    9494
    9595  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     96  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9697  try
    9798  {
    98     final ItemQuery<Platform> query = Base.getConfiguredQuery(dc, cc, true, Platform.getQuery(), mode);
     99    final ItemQuery<Platform> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Platform.getQuery(), mode);
    99100    platforms = query.iterate(dc);
    100101  }
    … …  
    104105  }
    105106  int numListed = 0;
    106   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    107107  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    108108  ExtensionsInvoker<ListColumnAction<Platform,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/platforms/variants/index.jsp

    r7605 r7914  
    263263    final Platform platform = Platform.getById(dc, platformId);
    264264    final ItemQuery<PlatformVariant> query = platform.getVariants();
    265     cc.configureQuery(dc, query, true);
     265    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     266    cc.configureQuery(dc, query, jspContext, true);
    266267    cc.setQuery(query);
    267     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    268268    ExtensionsInvoker<ListColumnAction<PlatformVariant,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    269269    listInvoker.render(new ListColumnExportRenderer<PlatformVariant>(cc));
    … …  
    284284    final Platform platform = Platform.getById(dc, platformId);
    285285    final ItemQuery<PlatformVariant> query = platform.getVariants();
    286     cc.configureQuery(dc, query, true);
     286    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     287    cc.configureQuery(dc, query, jspContext, true);
    287288    dc.close();
    288289    cc.setQuery(query);
    … …  
    302303    final Platform platform = Platform.getById(dc, platformId);
    303304    final ItemQuery<PlatformVariant> query = platform.getVariants();
    304     cc.configureQuery(dc, query, true);
     305    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     306    cc.configureQuery(dc, query, jspContext, true);
    305307    dc.close();
    306308    cc.setQuery(query);

  • trunk/www/admin/platforms/variants/list_variants.jsp

    r7913 r7914  
    8787
    8888  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     89  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, platform);
    8990  try
    9091  {
    91     final ItemQuery<PlatformVariant> query = Base.getConfiguredQuery(dc, cc, true, platform == null ? PlatformVariant.getQuery() : platform.getVariants(), mode);
     92    final ItemQuery<PlatformVariant> query = Base.getConfiguredQuery(dc, cc, jspContext, true, platform == null ? PlatformVariant.getQuery() : platform.getVariants(), mode);
    9293    variants = query.iterate(dc);
    9394  }
    … …  
    9798  }
    9899  int numListed = 0;
    99   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, platform);
    100100  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    101101  ExtensionsInvoker<ListColumnAction<PlatformVariant,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/pluginconfigurations/index.jsp

    r7703 r7914  
    296296    query.setDistinct(true);
    297297    dc = sc.newDbControl();
    298     cc.configureQuery(dc, query, true);
     298    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     299    cc.configureQuery(dc, query, jspContext, true);
    299300    cc.setQuery(query);
    300     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    301301    ExtensionsInvoker<ListColumnAction<PluginConfiguration,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    302302    listInvoker.render(new ListColumnExportRenderer<PluginConfiguration>(cc));
    … …  
    319319    query.setDistinct(true);
    320320    dc = sc.newDbControl();
    321     cc.configureQuery(dc, query, true);
     321    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     322    cc.configureQuery(dc, query, jspContext, true);
    322323    dc.close();
    323324    cc.setQuery(query);
    … …  
    339340    query.setDistinct(true);
    340341    dc = sc.newDbControl();
    341     cc.configureQuery(dc, query, true);
     342    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     343    cc.configureQuery(dc, query, jspContext, true);
    342344    dc.close();
    343345    cc.setQuery(query);

  • trunk/www/admin/pluginconfigurations/list_configurations.jsp

    r7913 r7914  
    108108  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    109109  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     110  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    110111  try
    111112  {
    112     final ItemQuery<PluginConfiguration> query = Base.getConfiguredQuery(dc, cc, true, PluginConfiguration.getQuery(), mode);
     113    final ItemQuery<PluginConfiguration> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PluginConfiguration.getQuery(), mode);
    113114    query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
    114115    query.join(Hql.leftJoin(Item.PLUGINDEFINITION.getAlias(), "guiContexts", "ctx", null, false));
    … …  
    122123  }
    123124  int numListed = 0;
    124   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    125125  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    126126  ExtensionsInvoker<ListColumnAction<PluginConfiguration,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/plugindefinitions/index.jsp

    r7605 r7914  
    404404    query.setDistinct(true);
    405405    dc = sc.newDbControl();
    406     cc.configureQuery(dc, query, true);
     406    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     407    cc.configureQuery(dc, query, jspContext, true);
    407408    cc.setQuery(query);
    408409    registerExportUtils(cc);
    409     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    410410    ExtensionsInvoker<ListColumnAction<PluginDefinition,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    411411    listInvoker.render(new ListColumnExportRenderer<PluginDefinition>(cc));
    … …  
    428428    query.setDistinct(true);
    429429    dc = sc.newDbControl();
    430     cc.configureQuery(dc, query, true);
     430    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     431    cc.configureQuery(dc, query, jspContext, true);
    431432    dc.close();
    432433    cc.setQuery(query);
    … …  
    447448    query.setDistinct(true);
    448449    dc = sc.newDbControl();
    449     cc.configureQuery(dc, query, true);
     450    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     451    cc.configureQuery(dc, query, jspContext, true);
    450452    dc.close();
    451453    cc.setQuery(query);

  • trunk/www/admin/plugindefinitions/list_plugins.jsp

    r7913 r7914  
    118118
    119119  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     120  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    120121  try
    121122  {
    122     final ItemQuery<PluginDefinition> query = Base.getConfiguredQuery(dc, cc, true, PluginDefinition.getQuery(), mode);
     123    final ItemQuery<PluginDefinition> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PluginDefinition.getQuery(), mode);
    123124    query.join(Hql.leftJoin("guiContexts", "ctx"));
    124125    query.setDistinct(true);
    … …  
    131132  }
    132133  int numListed = 0;
    133   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    134134  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    135135  ExtensionsInvoker<ListColumnAction<PluginDefinition,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/plugintypes/index.jsp

    r7605 r7914  
    245245    final ItemQuery<PluginType> query = PluginType.getQuery();
    246246    dc = sc.newDbControl();
    247     cc.configureQuery(dc, query, true);
     247    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     248    cc.configureQuery(dc, query, jspContext, true);
    248249    cc.setQuery(query);
    249250    registerExportUtils(cc);
    250     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    251251    ExtensionsInvoker<ListColumnAction<PluginType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    252252    listInvoker.render(new ListColumnExportRenderer<PluginType>(cc));
    … …  
    267267    final ItemQuery<PluginType> query = PluginType.getQuery();
    268268    dc = sc.newDbControl();
    269     cc.configureQuery(dc, query, true);
     269    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     270    cc.configureQuery(dc, query, jspContext, true);
    270271    dc.close();
    271272    cc.setQuery(query);
    … …  
    284285    final ItemQuery<PluginType> query = PluginType.getQuery();
    285286    dc = sc.newDbControl();
    286     cc.configureQuery(dc, query, true);
     287    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     288    cc.configureQuery(dc, query, jspContext, true);
    287289    dc.close();
    288290    cc.setQuery(query);

  • trunk/www/admin/plugintypes/list_plugintypes.jsp

    r7913 r7914  
    9595
    9696  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     97  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9798  try
    9899  {
    99     final ItemQuery<PluginType> query = Base.getConfiguredQuery(dc, cc, true, PluginType.getQuery(), mode);
     100    final ItemQuery<PluginType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PluginType.getQuery(), mode);
    100101    pluginTypes = query.iterate(dc);
    101102  }
    … …  
    105106  }
    106107  int numListed = 0;
    107   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108108  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    109109  ExtensionsInvoker<ListColumnAction<PluginType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/protocols/index.jsp

    r7703 r7914  
    317317    final ItemQuery<Protocol> query = Protocol.getQuery();
    318318    dc = sc.newDbControl();
    319     cc.configureQuery(dc, query, true);
     319    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     320    cc.configureQuery(dc, query, jspContext, true);
    320321    cc.setQuery(query);
    321     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    322322    ExtensionsInvoker<ListColumnAction<Protocol,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    323323    listInvoker.render(new ListColumnExportRenderer<Protocol>(cc));
    … …  
    337337    final ItemQuery<Protocol> query = Protocol.getQuery();
    338338    dc = sc.newDbControl();
    339     cc.configureQuery(dc, query, true);
     339    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     340    cc.configureQuery(dc, query, jspContext, true);
    340341    dc.close();
    341342    cc.setQuery(query);
    … …  
    354355    final ItemQuery<Protocol> query = Protocol.getQuery();
    355356    dc = sc.newDbControl();
    356     cc.configureQuery(dc, query, true);
     357    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     358    cc.configureQuery(dc, query, jspContext, true);
    357359    dc.close();
    358360    cc.setQuery(query);

  • trunk/www/admin/protocols/list_protocol.jsp

    r7913 r7914  
    105105 
    106106  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    107   final ItemQuery<Protocol> query = Base.getConfiguredQuery(dc, cc, true, Protocol.getQuery(), mode);
    108 
    109107  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     108  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    110109  try
    111110  {
     111    final ItemQuery<Protocol> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Protocol.getQuery(), mode);
    112112    protocols = query.iterate(dc);
    113113  }
    … …  
    117117  }
    118118  int numListed = 0;
    119   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    120119  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    121120  ExtensionsInvoker<ListColumnAction<Protocol,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/quantities/index.jsp

    r7605 r7914  
    242242    final ItemQuery<Quantity> query = Quantity.getQuery();
    243243    dc = sc.newDbControl();
    244     cc.configureQuery(dc, query, true);
     244    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     245    cc.configureQuery(dc, query, jspContext, true);
    245246    cc.setQuery(query);
    246247    registerExportUtils(cc);
    247     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    248248    ExtensionsInvoker<ListColumnAction<Quantity,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    249249    listInvoker.render(new ListColumnExportRenderer<Quantity>(cc));
    … …  
    264264    final ItemQuery<Quantity> query = Quantity.getQuery();
    265265    dc = sc.newDbControl();
    266     cc.configureQuery(dc, query, true);
     266    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     267    cc.configureQuery(dc, query, jspContext, true);
    267268    dc.close();
    268269    cc.setQuery(query);
    … …  
    281282    final ItemQuery<Quantity> query = Quantity.getQuery();
    282283    dc = sc.newDbControl();
    283     cc.configureQuery(dc, query, true);
     284    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     285    cc.configureQuery(dc, query, jspContext, true);
    284286    dc.close();
    285287    cc.setQuery(query);

  • trunk/www/admin/quantities/list_quantities.jsp

    r7913 r7914  
    9393
    9494  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     95  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9596  try
    9697  {
    97     final ItemQuery<Quantity> query = Base.getConfiguredQuery(dc, cc, true, Quantity.getQuery(), mode);
     98    final ItemQuery<Quantity> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Quantity.getQuery(), mode);
    9899    quantities = query.iterate(dc);
    99100  }
    … …  
    103104  }
    104105  int numListed = 0;
    105   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    106106  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    107107  ExtensionsInvoker<ListColumnAction<Quantity,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/quantities/units/index.jsp

    r7605 r7914  
    220220    final Quantity quantity = Quantity.getById(dc, quantityId);
    221221    final ItemQuery<Unit> query = quantity.getUnits();
    222     cc.configureQuery(dc, query, true);
     222    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     223    cc.configureQuery(dc, query, jspContext, true);
    223224    dc.close();
    224225    cc.setQuery(query);
    … …  
    238239    final Quantity quantity = Quantity.getById(dc, quantityId);
    239240    final ItemQuery<Unit> query = quantity.getUnits();
    240     cc.configureQuery(dc, query, true);
     241    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     242    cc.configureQuery(dc, query, jspContext, true);
    241243    dc.close();
    242244    cc.setQuery(query);
    … …  
    256258    final Quantity quantity = Quantity.getById(dc, quantityId);
    257259    final ItemQuery<Unit> query = quantity.getUnits();
    258     cc.configureQuery(dc, query, true);
     260    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     261    cc.configureQuery(dc, query, jspContext, true);
    259262    dc.close();
    260263    cc.setQuery(query);

  • trunk/www/admin/quota/index.jsp

    r7605 r7914  
    253253    final ItemQuery<Quota> query = Quota.getQuery();
    254254    dc = sc.newDbControl();
    255     cc.configureQuery(dc, query, true);
     255    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     256    cc.configureQuery(dc, query, jspContext, true);
    256257    cc.setQuery(query);
    257     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    258258    ExtensionsInvoker<ListColumnAction<Quota,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    259259    listInvoker.render(new ListColumnExportRenderer<Quota>(cc));
    … …  
    273273    final ItemQuery<Quota> query = Quota.getQuery();
    274274    dc = sc.newDbControl();
    275     cc.configureQuery(dc, query, true);
     275    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     276    cc.configureQuery(dc, query, jspContext, true);
    276277    dc.close();
    277278    cc.setQuery(query);
    … …  
    290291    final ItemQuery<Quota> query = Quota.getQuery();
    291292    dc = sc.newDbControl();
    292     cc.configureQuery(dc, query, true);
     293    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     294    cc.configureQuery(dc, query, jspContext, true);
    293295    dc.close();
    294296    cc.setQuery(query);

  • trunk/www/admin/quota/list_quota.jsp

    r7913 r7914  
    8585
    8686  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     87  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8788  try
    8889  {
    89     final ItemQuery<Quota> query = Base.getConfiguredQuery(dc, cc, true, Quota.getQuery(), mode);
     90    final ItemQuery<Quota> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Quota.getQuery(), mode);
    9091    quota = query.iterate(dc);
    9192  }
    … …  
    9596  }
    9697  int numListed = 0;
    97   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9898  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9999  ExtensionsInvoker<ListColumnAction<Quota,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/quotatypes/index.jsp

    r7605 r7914  
    153153    final ItemQuery<QuotaType> query = QuotaType.getQuery();
    154154    dc = sc.newDbControl();
    155     cc.configureQuery(dc, query, true);
     155    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     156    cc.configureQuery(dc, query, jspContext, true);
    156157    cc.setQuery(query);
    157     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    158158    ExtensionsInvoker<ListColumnAction<QuotaType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    159159    listInvoker.render(new ListColumnExportRenderer<QuotaType>(cc));
    … …  
    173173    final ItemQuery<QuotaType> query = QuotaType.getQuery();
    174174    dc = sc.newDbControl();
    175     cc.configureQuery(dc, query, true);
     175    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     176    cc.configureQuery(dc, query, jspContext, true);
    176177    dc.close();
    177178    cc.setQuery(query);

  • trunk/www/admin/quotatypes/list_quotatypes.jsp

    r7604 r7914  
    8383
    8484  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     85  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8586  try
    8687  {
    87     final ItemQuery<QuotaType> query = Base.getConfiguredQuery(dc, cc, true, QuotaType.getQuery(), mode);
     88    final ItemQuery<QuotaType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, QuotaType.getQuery(), mode);
    8889    quotaTypes = query.iterate(dc);
    8990  }
    … …  
    9394  }
    9495  int numListed = 0;
    95   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9696  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9797  ExtensionsInvoker<ListColumnAction<QuotaType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/reporterclonetemplates/index.jsp

    r7605 r7914  
    291291    final ItemQuery<ReporterCloneTemplate> query = ReporterCloneTemplate.getQuery();
    292292    dc = sc.newDbControl();
    293     cc.configureQuery(dc, query, true);
     293    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     294    cc.configureQuery(dc, query, jspContext, true);
    294295    cc.setQuery(query);
    295     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    296296    ExtensionsInvoker<ListColumnAction<ReporterCloneTemplate,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    297297    listInvoker.render(new ListColumnExportRenderer<ReporterCloneTemplate>(cc));
    … …  
    311311    final ItemQuery<ReporterCloneTemplate> query = ReporterCloneTemplate.getQuery();
    312312    dc = sc.newDbControl();
    313     cc.configureQuery(dc, query, true);
     313    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     314    cc.configureQuery(dc, query, jspContext, true);
    314315    dc.close();
    315316    cc.setQuery(query);
    … …  
    328329    final ItemQuery<ReporterCloneTemplate> query = ReporterCloneTemplate.getQuery();
    329330    dc = sc.newDbControl();
    330     cc.configureQuery(dc, query, true);
     331    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     332    cc.configureQuery(dc, query, jspContext, true);
    331333    dc.close();
    332334    cc.setQuery(query);

  • trunk/www/admin/reporterclonetemplates/list_templates.jsp

    r7913 r7914  
    8484
    8585  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     86  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8687  try
    8788  {
    88     final ItemQuery<ReporterCloneTemplate> query = Base.getConfiguredQuery(dc, cc, true, ReporterCloneTemplate.getQuery(), mode);
     89    final ItemQuery<ReporterCloneTemplate> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ReporterCloneTemplate.getQuery(), mode);
    8990    query.join(Hql.leftJoin("properties", "prp"));
    9091    query.setDistinct(true);
    … …  
    9697  }
    9798  int numListed = 0;
    98   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9999  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    100100  ExtensionsInvoker<ListColumnAction<ReporterCloneTemplate,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/reportertypes/index.jsp

    r7605 r7914  
    219219    final ItemQuery<ReporterType> query = ReporterType.getQuery();
    220220    dc = sc.newDbControl();
    221     cc.configureQuery(dc, query, true);
     221    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     222    cc.configureQuery(dc, query, jspContext, true);
    222223    cc.setQuery(query);
    223     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    224224    ExtensionsInvoker<ListColumnAction<ReporterType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    225225    listInvoker.render(new ListColumnExportRenderer<ReporterType>(cc));
    … …  
    239239    final ItemQuery<ReporterType> query = ReporterType.getQuery();
    240240    dc = sc.newDbControl();
    241     cc.configureQuery(dc, query, true);
     241    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     242    cc.configureQuery(dc, query, jspContext, true);
    242243    dc.close();
    243244    cc.setQuery(query);
    … …  
    256257    final ItemQuery<ReporterType> query = ReporterType.getQuery();
    257258    dc = sc.newDbControl();
    258     cc.configureQuery(dc, query, true);
     259    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     260    cc.configureQuery(dc, query, jspContext, true);
    259261    dc.close();
    260262    cc.setQuery(query);

  • trunk/www/admin/reportertypes/list_reportertypes.jsp

    r7913 r7914  
    8585
    8686  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     87  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8788  try
    8889  {
    89     final ItemQuery<ReporterType> query = Base.getConfiguredQuery(dc, cc, true, ReporterType.getQuery(), mode);
     90    final ItemQuery<ReporterType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ReporterType.getQuery(), mode);
    9091    reporterTypes = query.iterate(dc);
    9192  }
    … …  
    9596  }
    9697  int numListed = 0;
    97   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9898  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9999  ExtensionsInvoker<ListColumnAction<ReporterType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/roles/index.jsp

    r7605 r7914  
    270270    final ItemQuery<Role> query = Role.getQuery();
    271271    dc = sc.newDbControl();
    272     cc.configureQuery(dc, query, true);
     272    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     273    cc.configureQuery(dc, query, jspContext, true);
    273274    cc.setQuery(query);
    274275    registerExportUtils(cc);
    275     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    276276    ExtensionsInvoker<ListColumnAction<Role,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    277277    listInvoker.render(new ListColumnExportRenderer<Role>(cc));
    … …  
    292292    final ItemQuery<Role> query = Role.getQuery();
    293293    dc = sc.newDbControl();
    294     cc.configureQuery(dc, query, true);
     294    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     295    cc.configureQuery(dc, query, jspContext, true);
    295296    dc.close();
    296297    cc.setQuery(query);
    … …  
    309310    final ItemQuery<Role> query = Role.getQuery();
    310311    dc = sc.newDbControl();
    311     cc.configureQuery(dc, query, true);
     312    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     313    cc.configureQuery(dc, query, jspContext, true);
    312314    dc.close();
    313315    cc.setQuery(query);

  • trunk/www/admin/roles/list_roles.jsp

    r7913 r7914  
    9595
    9696  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     97  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9798  try
    9899  {
    99     final ItemQuery<Role> query = Base.getConfiguredQuery(dc, cc, true, Role.getQuery(), mode);
     100    final ItemQuery<Role> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Role.getQuery(), mode);
    100101    roles = query.iterate(dc);
    101102  }
    … …  
    105106  }
    106107  int numListed = 0;
    107   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108108  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    109109  ExtensionsInvoker<ListColumnAction<Role,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/software/index.jsp

    r7703 r7914  
    292292    final ItemQuery<Software> query = Software.getQuery();
    293293    dc = sc.newDbControl();
    294     cc.configureQuery(dc, query, true);
     294    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     295    cc.configureQuery(dc, query, jspContext, true);
    295296    cc.setQuery(query);
    296     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    297297    ExtensionsInvoker<ListColumnAction<Software,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    298298    listInvoker.render(new ListColumnExportRenderer<Software>(cc));
    … …  
    312312    final ItemQuery<Software> query = Software.getQuery();
    313313    dc = sc.newDbControl();
    314     cc.configureQuery(dc, query, true);
     314    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     315    cc.configureQuery(dc, query, jspContext, true);
    315316    dc.close();
    316317    cc.setQuery(query);
    … …  
    329330    final ItemQuery<Software> query = Software.getQuery();
    330331    dc = sc.newDbControl();
    331     cc.configureQuery(dc, query, true);
     332    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     333    cc.configureQuery(dc, query, jspContext, true);
    332334    dc.close();
    333335    cc.setQuery(query);

  • trunk/www/admin/software/list_software.jsp

    r7913 r7914  
    106106
    107107  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     108  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108109  try
    109110  {
    110     final ItemQuery<Software> query = Base.getConfiguredQuery(dc, cc, true, Software.getQuery(), mode);
     111    final ItemQuery<Software> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Software.getQuery(), mode);
    111112    software = query.iterate(dc);
    112113  }
    … …  
    116117  }
    117118  int numListed = 0;
    118   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    119119  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    120120  ExtensionsInvoker<ListColumnAction<Software,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/admin/users/index.jsp

    r7605 r7914  
    391391    final ItemQuery<User> query = User.getQuery();
    392392    dc = sc.newDbControl();
    393     cc.configureQuery(dc, query, true);
     393    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     394    cc.configureQuery(dc, query, jspContext, true);
    394395    cc.setQuery(query);
    395396    registerExportUtils(cc);
    396     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    397397    ExtensionsInvoker<ListColumnAction<User,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    398398    listInvoker.render(new ListColumnExportRenderer<User>(cc));
    … …  
    413413    final ItemQuery<User> query = User.getQuery();
    414414    dc = sc.newDbControl();
    415     cc.configureQuery(dc, query, true);
     415    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     416    cc.configureQuery(dc, query, jspContext, true);
    416417    dc.close();
    417418    cc.setQuery(query);
    … …  
    430431    final ItemQuery<User> query = User.getQuery();
    431432    dc = sc.newDbControl();
    432     cc.configureQuery(dc, query, true);
     433    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     434    cc.configureQuery(dc, query, jspContext, true);
    433435    dc.close();
    434436    cc.setQuery(query);

  • trunk/www/admin/users/list_users.jsp

    r7913 r7914  
    109109 
    110110  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     111  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    111112  try
    112113  {
    113     final ItemQuery<User> query = Base.getConfiguredQuery(dc, cc, true, User.getQuery(), mode);
     114    final ItemQuery<User> query = Base.getConfiguredQuery(dc, cc, jspContext, true, User.getQuery(), mode);
    114115    users = query.iterate(dc);
    115116  }
    … …  
    119120  }
    120121  int numListed = 0;
    121   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    122122  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    123123  ExtensionsInvoker<ListColumnAction<User,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/bioplateeventtypes/index.jsp

    r7605 r7914  
    225225    final ItemQuery<BioPlateEventType> query = BioPlateEventType.getQuery();
    226226    dc = sc.newDbControl();
    227     cc.configureQuery(dc, query, true);
     227    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     228    cc.configureQuery(dc, query, jspContext, true);
    228229    cc.setQuery(query);
    229     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    230230    ExtensionsInvoker<ListColumnAction<BioPlateEventType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    231231    listInvoker.render(new ListColumnExportRenderer<BioPlateEventType>(cc));
    … …  
    245245    final ItemQuery<BioPlateEventType> query = BioPlateEventType.getQuery();
    246246    dc = sc.newDbControl();
    247     cc.configureQuery(dc, query, true);
     247    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     248    cc.configureQuery(dc, query, jspContext, true);
    248249    dc.close();
    249250    cc.setQuery(query);
    … …  
    262263    final ItemQuery<BioPlateEventType> query = BioPlateEventType.getQuery();
    263264    dc = sc.newDbControl();
    264     cc.configureQuery(dc, query, true);
     265    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     266    cc.configureQuery(dc, query, jspContext, true);
    265267    dc.close();
    266268    cc.setQuery(query);

  • trunk/www/biomaterials/bioplateeventtypes/list_eventtypes.jsp

    r7913 r7914  
    8484{
    8585  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     86  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8687  try
    8788  {
    88     final ItemQuery<BioPlateEventType> query = Base.getConfiguredQuery(dc, cc, true, BioPlateEventType.getQuery(), mode);
     89    final ItemQuery<BioPlateEventType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, BioPlateEventType.getQuery(), mode);
    8990    bioPlateEventTypes = query.iterate(dc);
    9091  }
    … …  
    9495  }
    9596  int numListed = 0;
    96   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9797  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9898  ExtensionsInvoker<ListColumnAction<BioPlateEventType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/bioplates/events/index.jsp

    r7703 r7914  
    284284    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    285285    final ItemQuery<BioPlateEvent> query = bioplate.getEvents();
    286     cc.configureQuery(dc, query, true);
     286    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     287    cc.configureQuery(dc, query, jspContext, true);
    287288    cc.setQuery(query);
    288     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    289289    ExtensionsInvoker<ListColumnAction<BioPlate,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    290290    listInvoker.render(new ListColumnExportRenderer<BioPlate>(cc));
    … …  
    305305    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    306306    final ItemQuery<BioPlateEvent> query = bioplate.getEvents();
    307     cc.configureQuery(dc, query, true);
     307    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     308    cc.configureQuery(dc, query, jspContext, true);
    308309    dc.close();
    309310    cc.setQuery(query);
    … …  
    323324    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    324325    final ItemQuery<BioPlateEvent> query = bioplate.getEvents();
    325     cc.configureQuery(dc, query, true);
     326    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     327    cc.configureQuery(dc, query, jspContext, true);
    326328    dc.close();
    327329    cc.setQuery(query);

  • trunk/www/biomaterials/bioplates/events/list_events.jsp

    r7913 r7914  
    9595  final BioPlate bioPlate = BioPlate.getById(dc, bioPlateId);
    9696  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     97  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioPlate);
    9798  try
    9899  {
    99     final ItemQuery<BioPlateEvent> query = Base.getConfiguredQuery(dc, cc, true, bioPlate.getEvents(), mode);
     100    final ItemQuery<BioPlateEvent> query = Base.getConfiguredQuery(dc, cc, jspContext, true, bioPlate.getEvents(), mode);
    100101    events = query.iterate(dc);
    101102  }
    … …  
    107108  int numListed = 0;
    108109  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    109   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioPlate);
    110110  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    111111  ExtensionsInvoker<ListColumnAction<BioPlateEvent,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/bioplates/index.jsp

    r7703 r7914  
    290290    final ItemQuery<BioPlate> query = BioPlate.getQuery();
    291291    dc = sc.newDbControl();
    292     cc.configureQuery(dc, query, true);
     292    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     293    cc.configureQuery(dc, query, jspContext, true);
    293294    cc.setQuery(query);
    294     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    295295    ExtensionsInvoker<ListColumnAction<BioPlate,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    296296    listInvoker.render(new ListColumnExportRenderer<BioPlate>(cc));
    … …  
    310310    final ItemQuery<BioPlate> query = BioPlate.getQuery();
    311311    dc = sc.newDbControl();
    312     cc.configureQuery(dc, query, true);
     312    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     313    cc.configureQuery(dc, query, jspContext, true);
    313314    dc.close();
    314315    cc.setQuery(query);
    … …  
    327328    final ItemQuery<BioPlate> query = BioPlate.getQuery();
    328329    dc = sc.newDbControl();
    329     cc.configureQuery(dc, query, true);
     330    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     331    cc.configureQuery(dc, query, jspContext, true);
    330332    dc.close();
    331333    cc.setQuery(query);

  • trunk/www/biomaterials/bioplates/list_bioplates.jsp

    r7913 r7914  
    131131 
    132132  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     133  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    133134  try
    134135  {
    135     final ItemQuery<BioPlate> query = Base.getConfiguredQuery(dc, cc, true, BioPlate.getQuery(), mode);
     136    final ItemQuery<BioPlate> query = Base.getConfiguredQuery(dc, cc, jspContext, true, BioPlate.getQuery(), mode);
    136137    bioplates = query.iterate(dc);
    137138  }
    … …  
    143144  int numListed = 0;
    144145  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    145   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    146146  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    147147  ExtensionsInvoker<ListColumnAction<BioPlate,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/bioplates/wells/index.jsp

    r7605 r7914  
    188188    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    189189    final ItemQuery<BioWell> query = bioplate.getBioWells();
    190     cc.configureQuery(dc, query, true);
     190    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     191    cc.configureQuery(dc, query, jspContext, true);
    191192    query.join(Hql.leftJoin(null, "bioMaterial", "mbm", null, true));
    192193    query.join(Hql.leftJoin("mbm", "creationEvent", "evt", null, true));
    … …  
    197198    cc.setQuery(query);
    198199    registerExportFormatters(cc);
    199     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    200200    ExtensionsInvoker<ListColumnAction<BioWell,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    201201    listInvoker.render(new ListColumnExportRenderer<BioWell>(cc));
    … …  
    216216    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    217217    final ItemQuery<BioWell> query = bioplate.getBioWells();
    218     cc.configureQuery(dc, query, true);
     218    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     219    cc.configureQuery(dc, query, jspContext, true);
    219220    dc.close();
    220221    cc.setQuery(query);
    … …  
    234235    final BioPlate bioplate = BioPlate.getById(dc, bioplateId);
    235236    final ItemQuery<BioWell> query = bioplate.getBioWells();
    236     cc.configureQuery(dc, query, true);
     237    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     238    cc.configureQuery(dc, query, jspContext, true);
    237239    dc.close();
    238240    cc.setQuery(query);

  • trunk/www/biomaterials/bioplates/wells/list_biowells.jsp

    r7913 r7914  
    144144  }
    145145
     146  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioplate);
    146147  try
    147148  {
    148     final ItemQuery<BioWell> query = Base.getConfiguredQuery(dc, cc, true, bioplate.getBioWells(), mode);
     149    final ItemQuery<BioWell> query = Base.getConfiguredQuery(dc, cc, jspContext, true, bioplate.getBioWells(), mode);
    149150    query.join(Hql.leftJoin(null, "bioMaterial", "mbm", null, true));
    150151    query.join(Hql.leftJoin("mbm", "creationEvent", "evt", null, true));
    … …  
    161162  }
    162163  int numListed = 0;
    163   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioplate);
    164164  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    165165  ExtensionsInvoker<ListColumnAction<BioWell,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/bioplatetypes/index.jsp

    r7605 r7914  
    249249    final ItemQuery<BioPlateType> query = BioPlateType.getQuery();
    250250    dc = sc.newDbControl();
    251     cc.configureQuery(dc, query, true);
     251    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     252    cc.configureQuery(dc, query, jspContext, true);
    252253    cc.setQuery(query);
    253     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    254254    ExtensionsInvoker<ListColumnAction<BioPlateType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    255255    listInvoker.render(new ListColumnExportRenderer<BioPlateType>(cc));
    … …  
    269269    final ItemQuery<BioPlateType> query = BioPlateType.getQuery();
    270270    dc = sc.newDbControl();
    271     cc.configureQuery(dc, query, true);
     271    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     272    cc.configureQuery(dc, query, jspContext, true);
    272273    dc.close();
    273274    cc.setQuery(query);
    … …  
    286287    final ItemQuery<BioPlateType> query = BioPlateType.getQuery();
    287288    dc = sc.newDbControl();
    288     cc.configureQuery(dc, query, true);
     289    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     290    cc.configureQuery(dc, query, jspContext, true);
    289291    dc.close();
    290292    cc.setQuery(query);

  • trunk/www/biomaterials/bioplatetypes/list_platetypes.jsp

    r7913 r7914  
    111111    ));
    112112  final ItemQuery<ItemSubtype> storageTypeQuery = Base.getSubtypesQuery(Item.HARDWARE);
     113  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    113114  try
    114115  {
    115     final ItemQuery<BioPlateType> query = Base.getConfiguredQuery(dc, cc, true, BioPlateType.getQuery(), mode);
     116    final ItemQuery<BioPlateType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, BioPlateType.getQuery(), mode);
    116117    bioPlateTypes = query.iterate(dc);
    117118  }
    … …  
    121122  }
    122123  int numListed = 0;
    123   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    124124  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    125125  ExtensionsInvoker<ListColumnAction<BioPlateType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/biosources/index.jsp

    r7813 r7914  
    302302    final ItemQuery<BioSource> query = BioSource.getQuery();
    303303    dc = sc.newDbControl();
    304     cc.configureQuery(dc, query, true);
     304    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     305    cc.configureQuery(dc, query, jspContext, true);
    305306    cc.setQuery(query);
    306     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    307307    ExtensionsInvoker<ListColumnAction<BioSource,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    308308    listInvoker.render(new ListColumnExportRenderer<BioSource>(cc));
    … …  
    323323    final ItemQuery<BioSource> query = BioSource.getQuery();
    324324    dc = sc.newDbControl();
    325     cc.configureQuery(dc, query, true);
     325    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     326    cc.configureQuery(dc, query, jspContext, true);
    326327    dc.close();
    327328    cc.setQuery(query);
    … …  
    340341    final ItemQuery<BioSource> query = BioSource.getQuery();
    341342    dc = sc.newDbControl();
    342     cc.configureQuery(dc, query, true);
     343    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     344    cc.configureQuery(dc, query, jspContext, true);
    343345    dc.close();
    344346    cc.setQuery(query);
    … …  
    356358    final ItemQuery<BioSource> query = BioSource.getQuery();
    357359    dc = sc.newDbControl();
    358     cc.configureQuery(dc, query, true);
     360    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     361    cc.configureQuery(dc, query, jspContext, true);
    359362    dc.close();
    360363    cc.setQuery(query);
    … …  
    366369    final ItemQuery<BioSource> query = BioSource.getQuery();
    367370    dc = sc.newDbControl();
    368     cc.configureQuery(dc, query, true);
     371    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     372    cc.configureQuery(dc, query, jspContext, true);
    369373    dc.close();
    370374    cc.setQuery(query);

  • trunk/www/biomaterials/biosources/list_biosources.jsp

    r7913 r7914  
    127127 
    128128  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     129  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    129130  try
    130131  {
    131     final ItemQuery<BioSource> query = Base.getConfiguredQuery(dc, cc, true, BioSource.getQuery(), mode);
     132    final ItemQuery<BioSource> query = Base.getConfiguredQuery(dc, cc, jspContext, true, BioSource.getQuery(), mode);
    132133    bioSources = query.iterate(dc);
    133134  }
    … …  
    139140  int numListed = 0;
    140141  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    141   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    142142  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    143143  ExtensionsInvoker<ListColumnAction<BioSource,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/events/index.jsp

    r7703 r7914  
    215215    MeasuredBioMaterial bioMaterial = (MeasuredBioMaterial)bioMaterialType.getById(dc, bioMaterialId);
    216216    final ItemQuery<BioMaterialEvent> query = BioMaterialEvent.getQuery(bioMaterial);
    217     cc.configureQuery(dc, query, true);
     217    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     218    cc.configureQuery(dc, query, jspContext, true);
    218219    cc.setQuery(query);
    219     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    220220    ExtensionsInvoker<ListColumnAction<BioMaterialEvent,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    221221    listInvoker.render(new ListColumnExportRenderer<BioMaterialEvent>(cc));
    … …  
    236236    MeasuredBioMaterial bioMaterial = (MeasuredBioMaterial)bioMaterialType.getById(dc, bioMaterialId);
    237237    final ItemQuery<BioMaterialEvent> query = BioMaterialEvent.getQuery(bioMaterial);
    238     cc.configureQuery(dc, query, true);
     238    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     239    cc.configureQuery(dc, query, jspContext, true);
    239240    dc.close();
    240241    cc.setQuery(query);
    … …  
    254255    MeasuredBioMaterial bioMaterial = (MeasuredBioMaterial)bioMaterialType.getById(dc, bioMaterialId);
    255256    final ItemQuery<BioMaterialEvent> query = BioMaterialEvent.getQuery(bioMaterial);
    256     cc.configureQuery(dc, query, true);
     257    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     258    cc.configureQuery(dc, query, jspContext, true);
    257259    dc.close();
    258260    cc.setQuery(query);

  • trunk/www/biomaterials/events/list_events.jsp

    r7913 r7914  
    112112  Unit microGram = UnitUtil.getUnit(dc, Quantity.MASS, "µg");
    113113  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     114  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioMaterial);
    114115  try
    115116  {
    116     final ItemQuery<BioMaterialEvent> query = Base.getConfiguredQuery(dc, cc, true, bioMaterial.getEvents(), mode);
     117    final ItemQuery<BioMaterialEvent> query = Base.getConfiguredQuery(dc, cc, jspContext, true, bioMaterial.getEvents(), mode);
    117118    events = query.iterate(dc);
    118119  }
    … …  
    125126  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    126127  Formatter<Number> numericFormatter = FormatterFactory.getNumberFormatter(sc);
    127   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, bioMaterial);
    128128  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    129129  ExtensionsInvoker<ListColumnAction<BioMaterialEvent,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/extracts/index.jsp

    r7813 r7914  
    457457    final ItemQuery<Extract> query = Extract.getQuery();
    458458    dc = sc.newDbControl();
    459     cc.configureQuery(dc, query, true);
     459    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     460    cc.configureQuery(dc, query, jspContext, true);
    460461    cc.setQuery(query);
    461462    registerExportFormatters(cc);
    462     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    463463    ExtensionsInvoker<ListColumnAction<Extract,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    464464    listInvoker.render(new ListColumnExportRenderer<Extract>(cc));
    … …  
    493493    final ItemQuery<Extract> query = Extract.getQuery();
    494494    dc = sc.newDbControl();
    495     cc.configureQuery(dc, query, true);
     495    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     496    cc.configureQuery(dc, query, jspContext, true);
    496497    dc.close();
    497498    cc.setQuery(query);
    … …  
    510511    final ItemQuery<Extract> query = Extract.getQuery();
    511512    dc = sc.newDbControl();
    512     cc.configureQuery(dc, query, true);
     513    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     514    cc.configureQuery(dc, query, jspContext, true);
    513515    dc.close();
    514516    cc.setQuery(query);
    … …  
    526528    final ItemQuery<Extract> query = Extract.getQuery();
    527529    dc = sc.newDbControl();
    528     cc.configureQuery(dc, query, true);
     530    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     531    cc.configureQuery(dc, query, jspContext, true);
    529532    dc.close();
    530533    cc.setQuery(query);
    … …  
    536539    final ItemQuery<Extract> query = Extract.getQuery();
    537540    dc = sc.newDbControl();
    538     cc.configureQuery(dc, query, true);
     541    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     542    cc.configureQuery(dc, query, jspContext, true);
    539543    dc.close();
    540544    cc.setQuery(query);
    … …  
    546550    final ItemQuery<Extract> query = Extract.getQuery();
    547551    dc = sc.newDbControl();
    548     cc.configureQuery(dc, query, true);
     552    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     553    cc.configureQuery(dc, query, jspContext, true);
    549554    dc.close();
    550555    cc.filterOnSelectedItems(query);

  • trunk/www/biomaterials/extracts/list_extracts.jsp

    r7913 r7914  
    185185  Unit microGram = UnitUtil.getUnit(dc, Quantity.MASS, "µg");
    186186  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     187  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    187188  try
    188189  {
    189     final ItemQuery<Extract> query = Base.getConfiguredQuery(dc, cc, true, Extract.getQuery(), mode);
     190    final ItemQuery<Extract> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Extract.getQuery(), mode);
    190191    extracts = query.iterate(dc);
    191192  }
    … …  
    221222  }
    222223
    223   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    224224  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    225225  ExtensionsInvoker<ListColumnAction<Extract,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/kits/index.jsp

    r7703 r7914  
    283283    final ItemQuery<Kit> query = Kit.getQuery();
    284284    dc = sc.newDbControl();
    285     cc.configureQuery(dc, query, true);
     285    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     286    cc.configureQuery(dc, query, jspContext, true);
    286287    cc.setQuery(query);
    287     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    288288    ExtensionsInvoker<ListColumnAction<Kit,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    289289    listInvoker.render(new ListColumnExportRenderer<Kit>(cc));
    … …  
    303303    final ItemQuery<Kit> query = Kit.getQuery();
    304304    dc = sc.newDbControl();
    305     cc.configureQuery(dc, query, true);
     305    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     306    cc.configureQuery(dc, query, jspContext, true);
    306307    dc.close();
    307308    cc.setQuery(query);
    … …  
    320321    final ItemQuery<Kit> query = Kit.getQuery();
    321322    dc = sc.newDbControl();
    322     cc.configureQuery(dc, query, true);
     323    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     324    cc.configureQuery(dc, query, jspContext, true);
    323325    dc.close();
    324326    cc.setQuery(query);

  • trunk/www/biomaterials/kits/list_kits.jsp

    r7913 r7914  
    103103 
    104104  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    105   final ItemQuery<Kit> query = Base.getConfiguredQuery(dc, cc, true, Kit.getQuery(), mode);
    106 
    107105  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     106  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108107  try
    109108  {
     109    final ItemQuery<Kit> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Kit.getQuery(), mode);
    110110    kits = query.iterate(dc);
    111111  }
    … …  
    115115  }
    116116  int numListed = 0;
    117   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    118117  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    119118  ExtensionsInvoker<ListColumnAction<Kit,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/samples/index.jsp

    r7813 r7914  
    437437    final ItemQuery<Sample> query = Sample.getQuery();
    438438    dc = sc.newDbControl();
    439     cc.configureQuery(dc, query, true);
     439    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     440    cc.configureQuery(dc, query, jspContext, true);
    440441    registerExportUtils(cc);
    441442    cc.setQuery(query);
    442     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    443443    ExtensionsInvoker<ListColumnAction<Sample,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    444444    listInvoker.render(new ListColumnExportRenderer<Sample>(cc));
    … …  
    459459    final ItemQuery<Sample> query = Sample.getQuery();
    460460    dc = sc.newDbControl();
    461     cc.configureQuery(dc, query, true);
     461    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     462    cc.configureQuery(dc, query, jspContext, true);
    462463    dc.close();
    463464    cc.setQuery(query);
    … …  
    476477    final ItemQuery<Sample> query = Sample.getQuery();
    477478    dc = sc.newDbControl();
    478     cc.configureQuery(dc, query, true);
     479    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     480    cc.configureQuery(dc, query, jspContext, true);
    479481    dc.close();
    480482    cc.setQuery(query);
    … …  
    492494    final ItemQuery<Sample> query = Sample.getQuery();
    493495    dc = sc.newDbControl();
    494     cc.configureQuery(dc, query, true);
     496    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     497    cc.configureQuery(dc, query, jspContext, true);
    495498    dc.close();
    496499    cc.setQuery(query);
    … …  
    502505    final ItemQuery<Sample> query = Sample.getQuery();
    503506    dc = sc.newDbControl();
    504     cc.configureQuery(dc, query, true);
     507    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     508    cc.configureQuery(dc, query, jspContext, true);
    505509    dc.close();
    506510    cc.setQuery(query);
    … …  
    512516    final ItemQuery<Sample> query = Sample.getQuery();
    513517    dc = sc.newDbControl();
    514     cc.configureQuery(dc, query, true);
     518    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     519    cc.configureQuery(dc, query, jspContext, true);
    515520    dc.close();
    516521    cc.filterOnSelectedItems(query);

  • trunk/www/biomaterials/samples/list_samples.jsp

    r7913 r7914  
    160160    annotationLoaders.add(new AnnotationLoaderUtil(dc, manager, at, false, true));
    161161  }
     162  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    162163  try
    163164  {
    164     final ItemQuery<Sample> query = Base.getConfiguredQuery(dc, cc, true, Sample.getQuery(), mode);
     165    final ItemQuery<Sample> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Sample.getQuery(), mode);
    165166    samples = query.iterate(dc);
    166167  }
    … …  
    196197  }
    197198
    198   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    199199  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    200200  ExtensionsInvoker<ListColumnAction<Sample,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/biomaterials/tags/index.jsp

    r7703 r7914  
    276276    final ItemQuery<Tag> query = Tag.getQuery();
    277277    dc = sc.newDbControl();
    278     cc.configureQuery(dc, query, true);
     278    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     279    cc.configureQuery(dc, query, jspContext, true);
    279280    cc.setQuery(query);
    280     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    281281    ExtensionsInvoker<ListColumnAction<Tag,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    282282    listInvoker.render(new ListColumnExportRenderer<Tag>(cc));
    … …  
    296296    final ItemQuery<Tag> query = Tag.getQuery();
    297297    dc = sc.newDbControl();
    298     cc.configureQuery(dc, query, true);
     298    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     299    cc.configureQuery(dc, query, jspContext, true);
    299300    dc.close();
    300301    cc.setQuery(query);
    … …  
    313314    final ItemQuery<Tag> query = Tag.getQuery();
    314315    dc = sc.newDbControl();
    315     cc.configureQuery(dc, query, true);
     316    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     317    cc.configureQuery(dc, query, jspContext, true);
    316318    dc.close();
    317319    cc.setQuery(query);

  • trunk/www/biomaterials/tags/list_tags.jsp

    r7913 r7914  
    108108
    109109  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     110  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    110111  try
    111112  {
    112     final ItemQuery<Tag> query = Base.getConfiguredQuery(dc, cc, true, Tag.getQuery(), mode);
     113    final ItemQuery<Tag> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Tag.getQuery(), mode);
    113114    tags = query.iterate(dc);
    114115  }
    … …  
    118119  }
    119120  int numListed = 0;
    120   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    121121  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    122122  ExtensionsInvoker<ListColumnAction<Tag,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/common/history/index.jsp

    r7604 r7914  
    141141    BasicItem source = sourceType.getById(dc, sourceId);
    142142    final ItemQuery<ChangeHistory> query = ChangeHistory.getHistoryOf(source);
    143     cc.configureQuery(dc, query, true);
     143    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     144    cc.configureQuery(dc, query, jspContext, true);
    144145    registerExportUtils(cc);
    145146    cc.setQuery(query);
    146     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    147147    ExtensionsInvoker<ListColumnAction<ChangeHistory,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    148148    listInvoker.render(new ListColumnExportRenderer<ChangeHistory>(cc));

  • trunk/www/common/history/list_history.jsp

    r7913 r7914  
    8686  final BasicItem source = sourceType.getById(dc, sourceId); 
    8787  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     88  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8889  try
    8990  {
    9091    final ItemQuery<ChangeHistory> query =
    91       Base.getConfiguredQuery(dc, cc, true, ChangeHistory.getHistoryOf(source), mode);
     92      Base.getConfiguredQuery(dc, cc, jspContext, true, ChangeHistory.getHistoryOf(source), mode);
    9293    query.order(cc.getSortDirection().sortBy(Hql.property("id")));
    9394    history = query.iterate(dc);
    … …  
    100101  }
    101102  Formatter<Date> dateFormatter = FormatterFactory.getDateTimeFormatter(sc);
    102   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    103103  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    104104  ExtensionsInvoker<ListColumnAction<ChangeHistory,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/filemanager/files/index.jsp

    r7857 r7914  
    406406    final ItemQuery<File> query = File.getQuery();
    407407    dc = sc.newDbControl();
    408     cc.configureQuery(dc, query, true);
     408    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     409    cc.configureQuery(dc, query, jspContext, true);
    409410    if (!isSearch)
    410411    {
    … …  
    416417    registerExportUtils(cc);
    417418    cc.setQuery(query);
    418     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    419419    ExtensionsInvoker<ListColumnAction<File,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    420420    listInvoker.render(new ListColumnExportRenderer<File>(cc));
    … …  
    435435    final ItemQuery<File> query = File.getQuery();
    436436    dc = sc.newDbControl();
    437     cc.configureQuery(dc, query, true);
     437    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     438    cc.configureQuery(dc, query, jspContext, true);
    438439    if (!isSearch)
    439440    {
    … …  
    458459    final ItemQuery<File> query = File.getQuery();
    459460    dc = sc.newDbControl();
    460     cc.configureQuery(dc, query, true);
     461    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     462    cc.configureQuery(dc, query, jspContext, true);
    461463    if (!isSearch)
    462464    {

  • trunk/www/filemanager/files/list_files.jsp

    r7913 r7914  
    232232 
    233233  // Get all files in current directory
    234   final ItemQuery<File> fileQuery = Base.getConfiguredQuery(dc, cc, true, File.getQuery(), mode);
     234  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, current);
     235  final ItemQuery<File> fileQuery = Base.getConfiguredQuery(dc, cc, jspContext, true, File.getQuery(), mode);
    235236  if (!isSearch)
    236237  {
    … …  
    268269  int numListed = 0;
    269270  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    270   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, current);
    271271  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    272272  ExtensionsInvoker<ListColumnAction<File,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/filemanager/fileservers/index.jsp

    r7605 r7914  
    331331    final ItemQuery<FileServer> query = FileServer.getQuery();
    332332    dc = sc.newDbControl();
    333     cc.configureQuery(dc, query, true);
     333    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     334    cc.configureQuery(dc, query, jspContext, true);
    334335    cc.setQuery(query);
    335     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    336336    ExtensionsInvoker<ListColumnAction<FileServer,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    337337    listInvoker.render(new ListColumnExportRenderer<FileServer>(cc));
    … …  
    351351    final ItemQuery<FileServer> query = FileServer.getQuery();
    352352    dc = sc.newDbControl();
    353     cc.configureQuery(dc, query, true);
     353    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     354    cc.configureQuery(dc, query, jspContext, true);
    354355    dc.close();
    355356    cc.setQuery(query);
    … …  
    368369    final ItemQuery<FileServer> query = FileServer.getQuery();
    369370    dc = sc.newDbControl();
    370     cc.configureQuery(dc, query, true);
     371    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     372    cc.configureQuery(dc, query, jspContext, true);
    371373    dc.close();
    372374    cc.setQuery(query);

  • trunk/www/filemanager/fileservers/list_fileservers.jsp

    r7913 r7914  
    8383
    8484  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     85  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8586  try
    8687  {
    87     final ItemQuery<FileServer> query = Base.getConfiguredQuery(dc, cc, true, FileServer.getQuery(), mode);
     88    final ItemQuery<FileServer> query = Base.getConfiguredQuery(dc, cc, jspContext, true, FileServer.getQuery(), mode);
    8889    servers = query.iterate(dc);
    8990  }
    … …  
    9394  }
    9495  int numListed = 0;
    95   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9696  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9797  ExtensionsInvoker<ListColumnAction<FileServer,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/arraybatches/index.jsp

    r7703 r7914  
    305305    final ItemQuery<ArrayBatch> query = ArrayBatch.getQuery();
    306306    dc = sc.newDbControl();
    307     cc.configureQuery(dc, query, true);
     307    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     308    cc.configureQuery(dc, query, jspContext, true);
    308309    cc.setQuery(query);
    309     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    310310    ExtensionsInvoker<ListColumnAction<ArrayBatch,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    311311    listInvoker.render(new ListColumnExportRenderer<ArrayBatch>(cc));
    … …  
    325325    final ItemQuery<ArrayBatch> query = ArrayBatch.getQuery();
    326326    dc = sc.newDbControl();
    327     cc.configureQuery(dc, query, true);
     327    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     328    cc.configureQuery(dc, query, jspContext, true);
    328329    dc.close();
    329330    cc.setQuery(query);
    … …  
    342343    final ItemQuery<ArrayBatch> query = ArrayBatch.getQuery();
    343344    dc = sc.newDbControl();
    344     cc.configureQuery(dc, query, true);
     345    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     346    cc.configureQuery(dc, query, jspContext, true);
    345347    dc.close();
    346348    cc.setQuery(query);

  • trunk/www/lims/arraybatches/list_batches.jsp

    r7913 r7914  
    122122
    123123  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     124  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    124125  try
    125126  {
    126     final ItemQuery<ArrayBatch> query = Base.getConfiguredQuery(dc, cc, true, ArrayBatch.getQuery(), mode);
     127    final ItemQuery<ArrayBatch> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ArrayBatch.getQuery(), mode);
    127128    batches = query.iterate(dc);
    128129  }
    … …  
    133134  }
    134135  int numListed = 0;
    135   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    136136  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    137137  ExtensionsInvoker<ListColumnAction<ArrayBatch,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/arraydesigns/features/index.jsp

    r7604 r7914  
    114114    final DataQuery<FeatureData> query = arrayDesign.getFeatures();
    115115    query.join(Hql.leftJoin(null, "reporter", "rpt", null, true));
    116     cc.configureQuery(dc, query, true);
     116    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     117    cc.configureQuery(dc, query, jspContext, true);
    117118    cc.setQuery(query);
    118119    registerExportFormatters(cc);
    119     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    120120    ExtensionsInvoker<ListColumnAction<FeatureData,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    121121    listInvoker.render(new ListColumnExportRenderer<FeatureData>(cc));
    … …  
    130130    final DataQuery<ReporterData> query = arrayDesign.getReporters();
    131131    query.join(Hql.leftJoin("reporter", "rpt"));
    132     cc.configureQuery(dc, query, true);
     132    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     133    cc.configureQuery(dc, query, jspContext, true);
    133134    dc.close();
    134135    cc.setQuery(query);

  • trunk/www/lims/arraydesigns/features/list_features.jsp

    r7913 r7914  
    139139  }
    140140 
     141  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    141142  try
    142143  {
    143144    query.join(Hql.leftJoin(null, "reporter", "rpt", null, true));
    144     cc.configureQuery(dc, query, true);
     145    cc.configureQuery(dc, query, jspContext, true);
    145146    if (!"row".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("row")));
    146147    if (!"column".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("column")));
    … …  
    153154  }
    154155  int numListed = 0;
    155   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    156156  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    157157  ExtensionsInvoker<ListColumnAction<FeatureData,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/arraydesigns/index.jsp

    r7703 r7914  
    356356    final ItemQuery<ArrayDesign> query = ArrayDesign.getQuery();
    357357    dc = sc.newDbControl();
    358     cc.configureQuery(dc, query, true);
     358    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     359    cc.configureQuery(dc, query, jspContext, true);
    359360    cc.setQuery(query);
    360361    registerExportUtils(cc);
    361     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    362362    ExtensionsInvoker<ListColumnAction<ArrayDesign,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    363363    listInvoker.render(new ListColumnExportRenderer<ArrayDesign>(cc));
    … …  
    378378    final ItemQuery<ArrayDesign> query = ArrayDesign.getQuery();
    379379    dc = sc.newDbControl();
    380     cc.configureQuery(dc, query, true);
     380    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     381    cc.configureQuery(dc, query, jspContext, true);
    381382    dc.close();
    382383    cc.setQuery(query);
    … …  
    395396    final ItemQuery<ArrayDesign> query = ArrayDesign.getQuery();
    396397    dc = sc.newDbControl();
    397     cc.configureQuery(dc, query, true);
     398    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     399    cc.configureQuery(dc, query, jspContext, true);
    398400    dc.close();
    399401    cc.setQuery(query);

  • trunk/www/lims/arraydesigns/list_designs.jsp

    r7913 r7914  
    152152 
    153153  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     154  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    154155  try
    155156  {
    156     final ItemQuery<ArrayDesign> query = Base.getConfiguredQuery(dc, cc, true, ArrayDesign.getQuery(), mode);
     157    final ItemQuery<ArrayDesign> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ArrayDesign.getQuery(), mode);
    157158    designs = query.iterate(dc);
    158159  }
    … …  
    165166  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    166167  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    167   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    168168  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    169169  ExtensionsInvoker<ListColumnAction<ArrayDesign,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/arrayslides/index.jsp

    r7703 r7914  
    354354    final ItemQuery<ArraySlide> query = ArraySlide.getQuery();
    355355    dc = sc.newDbControl();
    356     cc.configureQuery(dc, query, true);
     356    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     357    cc.configureQuery(dc, query, jspContext, true);
    357358    cc.setQuery(query);
    358     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    359359    ExtensionsInvoker<ListColumnAction<ArraySlide,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    360360    listInvoker.render(new ListColumnExportRenderer<ArraySlide>(cc));
    … …  
    374374    final ItemQuery<ArraySlide> query = ArraySlide.getQuery();
    375375    dc = sc.newDbControl();
    376     cc.configureQuery(dc, query, true);
     376    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     377    cc.configureQuery(dc, query, jspContext, true);
    377378    dc.close();
    378379    cc.setQuery(query);
    … …  
    391392    final ItemQuery<ArraySlide> query = ArraySlide.getQuery();
    392393    dc = sc.newDbControl();
    393     cc.configureQuery(dc, query, true);
     394    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     395    cc.configureQuery(dc, query, jspContext, true);
    394396    dc.close();
    395397    cc.setQuery(query);

  • trunk/www/lims/arrayslides/list_slides.jsp

    r7913 r7914  
    111111
    112112  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     113  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    113114  try
    114115  {
    115     final ItemQuery<ArraySlide> query = Base.getConfiguredQuery(dc, cc, true, ArraySlide.getQuery(), mode);
     116    final ItemQuery<ArraySlide> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ArraySlide.getQuery(), mode);
    116117    slides = query.iterate(dc);
    117118  }
    … …  
    122123  }
    123124  int numListed = 0;
    124   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    125125  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    126126  ExtensionsInvoker<ListColumnAction<ArraySlide,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/geometries/index.jsp

    r7605 r7914  
    244244    final ItemQuery<PlateGeometry> query = PlateGeometry.getQuery();
    245245    dc = sc.newDbControl();
    246     cc.configureQuery(dc, query, true);
     246    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     247    cc.configureQuery(dc, query, jspContext, true);
    247248    cc.setQuery(query);
    248249    registerExportUtils(cc);
    249     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    250250    ExtensionsInvoker<ListColumnAction<PlateGeometry,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    251251    listInvoker.render(new ListColumnExportRenderer<PlateGeometry>(cc));
    … …  
    266266    final ItemQuery<PlateGeometry> query = PlateGeometry.getQuery();
    267267    dc = sc.newDbControl();
    268     cc.configureQuery(dc, query, true);
     268    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     269    cc.configureQuery(dc, query, jspContext, true);
    269270    dc.close();
    270271    cc.setQuery(query);
    … …  
    283284    final ItemQuery<PlateGeometry> query = PlateGeometry.getQuery();
    284285    dc = sc.newDbControl();
    285     cc.configureQuery(dc, query, true);
     286    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     287    cc.configureQuery(dc, query, jspContext, true);
    286288    dc.close();
    287289    cc.setQuery(query);

  • trunk/www/lims/geometries/list_geometries.jsp

    r7913 r7914  
    9595
    9696  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     97  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9798  try
    9899  {
    99     final ItemQuery<PlateGeometry> query = Base.getConfiguredQuery(dc, cc, true, PlateGeometry.getQuery(), mode);
     100    final ItemQuery<PlateGeometry> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PlateGeometry.getQuery(), mode);
    100101    geometries = query.iterate(dc);
    101102  }
    … …  
    105106  }
    106107  int numListed = 0;
    107   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108108  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    109109  ExtensionsInvoker<ListColumnAction<PlateGeometry,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/platemappings/index.jsp

    r7605 r7914  
    275275    final ItemQuery<PlateMapping> query = PlateMapping.getQuery();
    276276    dc = sc.newDbControl();
    277     cc.configureQuery(dc, query, true);
     277    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     278    cc.configureQuery(dc, query, jspContext, true);
    278279    cc.setQuery(query);
    279     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    280280    ExtensionsInvoker<ListColumnAction<PlateMapping,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    281281    listInvoker.render(new ListColumnExportRenderer<PlateMapping>(cc));
    … …  
    295295    final ItemQuery<PlateMapping> query = PlateMapping.getQuery();
    296296    dc = sc.newDbControl();
    297     cc.configureQuery(dc, query, true);
     297    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     298    cc.configureQuery(dc, query, jspContext, true);
    298299    dc.close();
    299300    cc.setQuery(query);
    … …  
    312313    final ItemQuery<PlateMapping> query = PlateMapping.getQuery();
    313314    dc = sc.newDbControl();
    314     cc.configureQuery(dc, query, true);
     315    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     316    cc.configureQuery(dc, query, jspContext, true);
    315317    dc.close();
    316318    cc.setQuery(query);

  • trunk/www/lims/platemappings/list_mappings.jsp

    r7913 r7914  
    9494 
    9595  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     96  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9697  try
    9798  {
    98     final ItemQuery<PlateMapping> query = Base.getConfiguredQuery(dc, cc, true, PlateMapping.getQuery(), mode);
     99    final ItemQuery<PlateMapping> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PlateMapping.getQuery(), mode);
    99100    mappings = query.iterate(dc);
    100101  }
    … …  
    104105  }
    105106  int numListed = 0;
    106   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    107107  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    108108  ExtensionsInvoker<ListColumnAction<PlateMapping,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/plates/events/index.jsp

    r7703 r7914  
    218218    final Plate plate = Plate.getById(dc, plateId);
    219219    final ItemQuery<PlateEvent> query = plate.getEvents();
    220     cc.configureQuery(dc, query, true);
     220    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     221    cc.configureQuery(dc, query, jspContext, true);
    221222    cc.setQuery(query);
    222     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    223223    ExtensionsInvoker<ListColumnAction<PlateEvent,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    224224    listInvoker.render(new ListColumnExportRenderer<PlateEvent>(cc));
    … …  
    239239    final Plate plate = Plate.getById(dc, plateId);
    240240    final ItemQuery<PlateEvent> query = plate.getEvents();
    241     cc.configureQuery(dc, query, true);
     241    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     242    cc.configureQuery(dc, query, jspContext, true);
    242243    dc.close();
    243244    cc.setQuery(query);
    … …  
    257258    final Plate plate = Plate.getById(dc, plateId);
    258259    final ItemQuery<PlateEvent> query = plate.getEvents();
    259     cc.configureQuery(dc, query, true);
     260    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     261    cc.configureQuery(dc, query, jspContext, true);
    260262    dc.close();
    261263    cc.setQuery(query);

  • trunk/www/lims/plates/events/list_events.jsp

    r7913 r7914  
    9292
    9393  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     94  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plate);
    9495  try
    9596  {
    96     final ItemQuery<PlateEvent> query = Base.getConfiguredQuery(dc, cc, true, plate.getEvents(), mode);
     97    final ItemQuery<PlateEvent> query = Base.getConfiguredQuery(dc, cc, jspContext, true, plate.getEvents(), mode);
    9798    events = query.iterate(dc);
    9899  }
    … …  
    102103  }
    103104  int numListed = 0;
    104   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plate);
    105105  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    106106  ExtensionsInvoker<ListColumnAction<PlateEvent,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/plates/index.jsp

    r7605 r7914  
    274274    final ItemQuery<Plate> query = Plate.getQuery();
    275275    dc = sc.newDbControl();
    276     cc.configureQuery(dc, query, true);
     276    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     277    cc.configureQuery(dc, query, jspContext, true);
    277278    cc.setQuery(query);
    278     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    279279    ExtensionsInvoker<ListColumnAction<Plate,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    280280    listInvoker.render(new ListColumnExportRenderer<Plate>(cc));
    … …  
    294294    final ItemQuery<Plate> query = Plate.getQuery();
    295295    dc = sc.newDbControl();
    296     cc.configureQuery(dc, query, true);
     296    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     297    cc.configureQuery(dc, query, jspContext, true);
    297298    dc.close();
    298299    cc.setQuery(query);
    … …  
    311312    final ItemQuery<Plate> query = Plate.getQuery();
    312313    dc = sc.newDbControl();
    313     cc.configureQuery(dc, query, true);
     314    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     315    cc.configureQuery(dc, query, jspContext, true);
    314316    dc.close();
    315317    cc.setQuery(query);

  • trunk/www/lims/plates/list_plates.jsp

    r7913 r7914  
    129129 
    130130  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     131  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    131132  try
    132133  {
    133     final ItemQuery<Plate> query = Base.getConfiguredQuery(dc, cc, true, Plate.getQuery(), mode);
     134    final ItemQuery<Plate> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Plate.getQuery(), mode);
    134135    plates = query.iterate(dc);
    135136  }
    … …  
    140141  }
    141142  int numListed = 0;
    142   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    143143  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    144144  ExtensionsInvoker<ListColumnAction<Plate,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/plates/wells/index.jsp

    r7605 r7914  
    162162    final Plate plate = Plate.getById(dc, plateId);
    163163    final ItemQuery<Well> query = plate.getWells();
    164     cc.configureQuery(dc, query, true);
     164    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     165    cc.configureQuery(dc, query, jspContext, true);
    165166    cc.setQuery(query);
    166167    if (!"row".equals(cc.getSortProperty()))
    … …  
    173174    }
    174175    registerExportFormatters(cc);
    175     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    176176    ExtensionsInvoker<ListColumnAction<Well,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    177177    listInvoker.render(new ListColumnExportRenderer<Well>(cc));
    … …  
    193193    final Plate plate = Plate.getById(dc, plateId);
    194194    final ItemQuery<Well> query = plate.getWells();
    195     cc.configureQuery(dc, query, true);
     195    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     196    cc.configureQuery(dc, query, jspContext, true);
    196197    dc.close();
    197198    cc.setQuery(query);
    … …  
    211212    final Plate plate = Plate.getById(dc, plateId);
    212213    final ItemQuery<Well> query = plate.getWells();
    213     cc.configureQuery(dc, query, true);
     214    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     215    cc.configureQuery(dc, query, jspContext, true);
    214216    dc.close();
    215217    cc.setQuery(query);
    … …  
    228230    final Plate plate = Plate.getById(dc, plateId);
    229231    final DataQuery<ReporterData> query = plate.getReporters();
    230     cc.configureQuery(dc, query, true);
     232    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     233    cc.configureQuery(dc, query, jspContext, true);
    231234    dc.close();
    232235    cc.setQuery(query);

  • trunk/www/lims/plates/wells/list_wells.jsp

    r7913 r7914  
    138138  }
    139139 
     140  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plate);
    140141  try
    141142  {
    142     final ItemQuery<Well> query = Base.getConfiguredQuery(dc, cc, true, plate.getWells(), mode);
     143    final ItemQuery<Well> query = Base.getConfiguredQuery(dc, cc, jspContext, true, plate.getWells(), mode);
    143144    query.join(Hql.leftJoin(null, "reporter", "rpt", null, true));
    144145    if (!"row".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("row")));
    … …  
    152153  }
    153154  int numListed = 0;
    154   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plate);
    155155  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    156156  ExtensionsInvoker<ListColumnAction<Well,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/platetypes/eventtypes/index.jsp

    r7703 r7914  
    204204    final PlateType plateType = PlateType.getById(dc, plateTypeId);
    205205    final ItemQuery<PlateEventType> query = PlateEventType.getQuery(plateType);
    206     cc.configureQuery(dc, query, true);
     206    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     207    cc.configureQuery(dc, query, jspContext, true);
    207208    cc.setQuery(query);
    208     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    209209    ExtensionsInvoker<ListColumnAction<PlateEventType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    210210    listInvoker.render(new ListColumnExportRenderer<PlateEventType>(cc));
    … …  
    225225    final PlateType plateType = PlateType.getById(dc, plateTypeId);
    226226    final ItemQuery<PlateEventType> query = PlateEventType.getQuery(plateType);
    227     cc.configureQuery(dc, query, true);
     227    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     228    cc.configureQuery(dc, query, jspContext, true);
    228229    dc.close();
    229230    cc.setQuery(query);
    … …  
    243244    final PlateType plateType = PlateType.getById(dc, plateTypeId);
    244245    final ItemQuery<PlateEventType> query = PlateEventType.getQuery(plateType);
    245     cc.configureQuery(dc, query, true);
     246    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     247    cc.configureQuery(dc, query, jspContext, true);
    246248    dc.close();
    247249    cc.setQuery(query);

  • trunk/www/lims/platetypes/eventtypes/list_eventtypes.jsp

    r7913 r7914  
    8585
    8686  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     87  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plateType);
    8788  try
    8889  {
    89     final ItemQuery<PlateEventType> query = Base.getConfiguredQuery(dc, cc, true, plateType.getEventTypes(), mode);
     90    final ItemQuery<PlateEventType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, plateType.getEventTypes(), mode);
    9091    eventTypes = query.iterate(dc);
    9192  }
    … …  
    9596  }
    9697  int numListed = 0;
    97   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, plateType);
    9898  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9999  ExtensionsInvoker<ListColumnAction<PlateEventType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/lims/platetypes/index.jsp

    r7703 r7914  
    292292    final ItemQuery<PlateType> query = PlateType.getQuery();
    293293    dc = sc.newDbControl();
    294     cc.configureQuery(dc, query, true);
     294    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     295    cc.configureQuery(dc, query, jspContext, true);
    295296    cc.setQuery(query);
    296297    registerExportUtils(cc);
    297     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    298298    ExtensionsInvoker<ListColumnAction<PlateType,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    299299    listInvoker.render(new ListColumnExportRenderer<PlateType>(cc));
    … …  
    314314    final ItemQuery<PlateType> query = PlateType.getQuery();
    315315    dc = sc.newDbControl();
    316     cc.configureQuery(dc, query, true);
     316    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     317    cc.configureQuery(dc, query, jspContext, true);
    317318    dc.close();
    318319    cc.setQuery(query);
    … …  
    331332    final ItemQuery<PlateType> query = PlateType.getQuery();
    332333    dc = sc.newDbControl();
    333     cc.configureQuery(dc, query, true);
     334    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     335    cc.configureQuery(dc, query, jspContext, true);
    334336    dc.close();
    335337    cc.setQuery(query);

  • trunk/www/lims/platetypes/list_platetypes.jsp

    r7913 r7914  
    103103 
    104104  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     105  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    105106  try
    106107  {
    107     final ItemQuery<PlateType> query = Base.getConfiguredQuery(dc, cc, true, PlateType.getQuery(), mode);
     108    final ItemQuery<PlateType> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PlateType.getQuery(), mode);
    108109    plateTypes = query.iterate(dc);
    109110  }
    … …  
    113114  }
    114115  int numListed = 0;
    115   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    116116  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    117117  ExtensionsInvoker<ListColumnAction<PlateType,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/my_base/messages/index.jsp

    r7786 r7914  
    200200    final User user = User.getById(dc, sc.getLoggedInUserId());
    201201    final ItemQuery<Message> query = Message.getQuery(user);
    202     cc.configureQuery(dc, query, true);
     202    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     203    cc.configureQuery(dc, query, jspContext, true);
    203204    cc.setQuery(query);
    204     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    205205    ExtensionsInvoker<ListColumnAction<Message,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    206206    listInvoker.render(new ListColumnExportRenderer<Message>(cc));
    … …  
    221221    final User user = User.getById(dc, sc.getLoggedInUserId());
    222222    final ItemQuery<Message> query = Message.getQuery(user);
    223     cc.configureQuery(dc, query, true);
     223    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     224    cc.configureQuery(dc, query, jspContext, true);
    224225    dc.close();
    225226    cc.setQuery(query);
    … …  
    239240    final User user = User.getById(dc, sc.getLoggedInUserId());
    240241    final ItemQuery<Message> query = Message.getQuery(user);
    241     cc.configureQuery(dc, query, true);
     242    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     243    cc.configureQuery(dc, query, jspContext, true);
    242244    dc.close();
    243245    cc.setQuery(query);

  • trunk/www/my_base/messages/list_messages.jsp

    r7913 r7914  
    8686
    8787  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     88  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8889  try
    8990  {
    90     final ItemQuery<Message> query = Base.getConfiguredQuery(dc, cc, true, Message.getQuery(user), mode);
     91    final ItemQuery<Message> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Message.getQuery(user), mode);
    9192    messages = query.iterate(dc);
    9293  }
    … …  
    9798  int numListed = 0;
    9899  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    99   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    100100  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    101101  ExtensionsInvoker<ListColumnAction<Message,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/my_base/projects/index.jsp

    r7703 r7914  
    312312    final ItemQuery<Project> query = Project.getQuery();
    313313    dc = sc.newDbControl();
    314     cc.configureQuery(dc, query, true);
     314    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     315    cc.configureQuery(dc, query, jspContext, true);
    315316    cc.setQuery(query);
    316     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    317317    ExtensionsInvoker<ListColumnAction<Project,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    318318    listInvoker.render(new ListColumnExportRenderer<Project>(cc));
    … …  
    332332    final ItemQuery<Project> query = Project.getQuery();
    333333    dc = sc.newDbControl();
    334     cc.configureQuery(dc, query, true);
     334    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     335    cc.configureQuery(dc, query, jspContext, true);
    335336    dc.close();
    336337    cc.setQuery(query);
    … …  
    349350    final ItemQuery<Project> query = Project.getQuery();
    350351    dc = sc.newDbControl();
    351     cc.configureQuery(dc, query, true);
     352    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     353    cc.configureQuery(dc, query, jspContext, true);
    352354    dc.close();
    353355    cc.setQuery(query);

  • trunk/www/my_base/projects/list_projects.jsp

    r7913 r7914  
    9898  }
    9999 
     100  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    100101  try
    101102  {
    102     final ItemQuery<Project> query = Base.getConfiguredQuery(dc, cc, true, Project.getQuery(), mode);
     103    final ItemQuery<Project> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Project.getQuery(), mode);
    103104    projects = query.iterate(dc);
    104105  }
    … …  
    110111  int numListed = 0;
    111112  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    112   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    113113  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    114114  ExtensionsInvoker<ListColumnAction<Project,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/derivedbioassays/index.jsp

    r7813 r7914  
    433433    final ItemQuery<DerivedBioAssay> query = DerivedBioAssay.getQuery();
    434434    dc = sc.newDbControl();
    435     cc.configureQuery(dc, query, true);
     435    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     436    cc.configureQuery(dc, query, jspContext, true);
    436437    cc.setQuery(query);
    437438    registerExportUtils(cc);
    438     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    439439    ExtensionsInvoker<ListColumnAction<DerivedBioAssay,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    440440    listInvoker.render(new ListColumnExportRenderer<DerivedBioAssay>(cc));
    … …  
    455455    final ItemQuery<DerivedBioAssay> query = DerivedBioAssay.getQuery();
    456456    dc = sc.newDbControl();
    457     cc.configureQuery(dc, query, true);
     457    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     458    cc.configureQuery(dc, query, jspContext, true);
    458459    dc.close();
    459460    cc.setQuery(query);
    … …  
    472473    final ItemQuery<DerivedBioAssay> query = DerivedBioAssay.getQuery();
    473474    dc = sc.newDbControl();
    474     cc.configureQuery(dc, query, true);
     475    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     476    cc.configureQuery(dc, query, jspContext, true);
    475477    dc.close();
    476478    cc.setQuery(query);
    … …  
    494496    final ItemQuery<DerivedBioAssay> query = DerivedBioAssay.getQuery();
    495497    dc = sc.newDbControl();
    496     cc.configureQuery(dc, query, true);
     498    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     499    cc.configureQuery(dc, query, jspContext, true);
    497500    dc.close();
    498501    cc.setQuery(query);
    … …  
    504507    final ItemQuery<DerivedBioAssay> query = DerivedBioAssay.getQuery();
    505508    dc = sc.newDbControl();
    506     cc.configureQuery(dc, query, true);
     509    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     510    cc.configureQuery(dc, query, jspContext, true);
    507511    dc.close();
    508512    cc.setQuery(query);

  • trunk/www/views/derivedbioassays/list_bioassays.jsp

    r7913 r7914  
    163163
    164164  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     165  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    165166  try
    166167  {
    167     final ItemQuery<DerivedBioAssay> query = Base.getConfiguredQuery(dc, cc, true, DerivedBioAssay.getQuery(), mode);
     168    final ItemQuery<DerivedBioAssay> query = Base.getConfiguredQuery(dc, cc, jspContext, true, DerivedBioAssay.getQuery(), mode);
    168169    bioAssays = query.iterate(dc);
    169170  }
    … …  
    175176  int numListed = 0;
    176177  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    177   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    178178  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    179179  ExtensionsInvoker<ListColumnAction<DerivedBioAssay,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/devices/index.jsp

    r7816 r7914  
    188188        null : User.getById(dc, sc.getLoggedInUserId());
    189189    final ItemQuery<UserDevice> query = UserDevice.getQuery(user);
    190     cc.configureQuery(dc, query, true);
     190    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     191    cc.configureQuery(dc, query, jspContext, true);
    191192    cc.setQuery(query);
    192     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    193193    ExtensionsInvoker<ListColumnAction<UserDevice,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    194194    listInvoker.render(new ListColumnExportRenderer<UserDevice>(cc));
    … …  
    210210        null : User.getById(dc, sc.getLoggedInUserId());
    211211    final ItemQuery<UserDevice> query = UserDevice.getQuery(user);
     212    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    212213    cc.configureQuery(dc, query, false);
    213214    dc.close();

  • trunk/www/views/devices/list_devices.jsp

    r7913 r7914  
    8585  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    8686  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     87  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8788  try
    8889  {
    89     final ItemQuery<UserDevice> query = Base.getConfiguredQuery(dc, cc, true, UserDevice.getQuery(user), mode);
     90    final ItemQuery<UserDevice> query = Base.getConfiguredQuery(dc, cc, jspContext, true, UserDevice.getQuery(user), mode);
    9091    devices = query.iterate(dc);
    9192  }
    … …  
    9697  }
    9798  int numListed = 0;
    98   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9999  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    100100  ExtensionsInvoker<ListColumnAction<UserDevice,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/experiments/bioassays/list_bioassays.jsp

    r7913 r7914  
    139139  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
    140140  experimentalFactors = experimentalFactorQuery.list(dc);
     141  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
     142      guiContext, bioAssaySet);
    141143  try
    142144  {
    143     final ItemQuery<BioAssay> query = Base.getConfiguredQuery(dc, cc, true, bioAssaySet.getBioAssays(), mode);
     145    final ItemQuery<BioAssay> query = Base.getConfiguredQuery(dc, cc, jspContext, true, bioAssaySet.getBioAssays(), mode);
    144146    query.join(Hql.leftJoin("rawParents", "rba"));
    145147    query.setDistinct(true);
    … …  
    152154  }
    153155  int numListed = 0;
    154   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
    155       guiContext, bioAssaySet);
    156156  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    157157  ExtensionsInvoker<OverviewPlotAction> overviewPlotInvoker = ExtensionsControl.useExtensions(jspContext,

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

    r7913 r7914  
    324324  transformationQuery.setMaxResults(-1);
    325325  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     326  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
     327      guiContext, root == null ? experiment : root);
    326328  try
    327329  {
    328     final ItemQuery<BioAssaySet> query = Base.getConfiguredQuery(dc, cc, true, experiment.getBioAssaySets(), mode);
     330    final ItemQuery<BioAssaySet> query = Base.getConfiguredQuery(dc, cc, jspContext, true, experiment.getBioAssaySets(), mode);
    329331    query.setFirstResult(0);
    330332    query.setMaxResults(-1);
    … …  
    340342  int numListed = 0;
    341343 
    342   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext,
    343     guiContext, root == null ? experiment : root);
    344344  ExtensionsInvoker<ButtonAction> toolsInvoker = ExtensionsControl.useExtensions(jspContext,
    345345      "net.sf.basedb.clients.web.bioassayset.list.tools");

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

    r7605 r7914  
    334334    final Experiment experiment = Experiment.getById(dc, experimentId);
    335335    final ItemQuery<BioAssaySet> query = experiment.getBioAssaySets();
    336     cc.configureQuery(dc, query, true);
     336    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     337    cc.configureQuery(dc, query, jspContext, true);
    337338    cc.setQuery(query);
    338     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    339339    ExtensionsInvoker<ListColumnAction<BioAssaySet,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    340340    listInvoker.render(new ListColumnExportRenderer<BioAssaySet>(cc));
    … …  
    356356    final Experiment experiment = Experiment.getById(dc, experimentId);
    357357    final ItemQuery<BioAssaySet> query = experiment.getBioAssaySets();
    358     cc.configureQuery(dc, query, true);
     358    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     359    cc.configureQuery(dc, query, jspContext, true);
    359360    dc.close();
    360361    cc.setQuery(query);
    … …  
    375376    final Experiment experiment = Experiment.getById(dc, experimentId);
    376377    final ItemQuery<BioAssaySet> query = experiment.getBioAssaySets();
    377     cc.configureQuery(dc, query, true);
     378    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     379    cc.configureQuery(dc, query, jspContext, true);
    378380    dc.close();
    379381    cc.setQuery(query);

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

    r7703 r7914  
    341341    final ItemQuery<Experiment> query = Experiment.getQuery();
    342342    dc = sc.newDbControl();
    343     cc.configureQuery(dc, query, true);
     343    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     344    cc.configureQuery(dc, query, jspContext, true);
    344345    cc.setQuery(query);
    345     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    346346    ExtensionsInvoker<ListColumnAction<Experiment,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    347347    listInvoker.render(new ListColumnExportRenderer<Experiment>(cc));
    … …  
    361361    final ItemQuery<Experiment> query = Experiment.getQuery();
    362362    dc = sc.newDbControl();
    363     cc.configureQuery(dc, query, true);
     363    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     364    cc.configureQuery(dc, query, jspContext, true);
    364365    dc.close();
    365366    cc.setQuery(query);
    … …  
    378379    final ItemQuery<Experiment> query = Experiment.getQuery();
    379380    dc = sc.newDbControl();
    380     cc.configureQuery(dc, query, true);
     381    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     382    cc.configureQuery(dc, query, jspContext, true);
    381383    dc.close();
    382384    cc.setQuery(query);

  • trunk/www/views/experiments/list_experiments.jsp

    r7913 r7914  
    106106  Unit bytes = UnitUtil.getUnit(dc, Quantity.STORAGE_SIZE, "B");
    107107  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     108  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    108109  try
    109110  {
    110     final ItemQuery<Experiment> query = Base.getConfiguredQuery(dc, cc, true, Experiment.getQuery(), mode);
     111    final ItemQuery<Experiment> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Experiment.getQuery(), mode);
    111112    experiments = query.iterate(dc);
    112113  }
    … …  
    117118  int numListed = 0;
    118119  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    119   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    120120  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    121121  ExtensionsInvoker<ListColumnAction<Experiment,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/formulas/index.jsp

    r7703 r7914  
    297297    final ItemQuery<Formula> query = Formula.getQuery();
    298298    dc = sc.newDbControl();
    299     cc.configureQuery(dc, query, true);
     299    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     300    cc.configureQuery(dc, query, jspContext, true);
    300301    cc.setQuery(query);
    301     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    302302    ExtensionsInvoker<ListColumnAction<Formula,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    303303    listInvoker.render(new ListColumnExportRenderer<Formula>(cc));
    … …  
    317317    final ItemQuery<Formula> query = Formula.getQuery();
    318318    dc = sc.newDbControl();
    319     cc.configureQuery(dc, query, false);
     319    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     320    cc.configureQuery(dc, query, jspContext, false);
    320321    dc.close();
    321322    cc.setQuery(query);
    … …  
    334335    final ItemQuery<Formula> query = Formula.getQuery();
    335336    dc = sc.newDbControl();
    336     cc.configureQuery(dc, query, false);
     337    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     338    cc.configureQuery(dc, query, jspContext, false);
    337339    dc.close();
    338340    cc.setQuery(query);

  • trunk/www/views/formulas/list_formulas.jsp

    r7913 r7914  
    123123  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    124124  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     125  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    125126  try
    126127  {
    127     final ItemQuery<Formula> query = Base.getConfiguredQuery(dc, cc, true, Formula.getQuery(), mode);
     128    final ItemQuery<Formula> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Formula.getQuery(), mode);
    128129    formulas = query.iterate(dc);
    129130  }
    … …  
    134135  }
    135136  int numListed = 0;
    136   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    137137  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    138138  ExtensionsInvoker<ListColumnAction<Formula,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/itemlists/index.jsp

    r7834 r7914  
    451451    final ItemQuery<ItemList> query = ItemList.getQuery();
    452452    dc = sc.newDbControl();
    453     cc.configureQuery(dc, query, true);
     453    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     454    cc.configureQuery(dc, query, jspContext, true);
    454455    dc.close();
    455456    cc.setQuery(query);
    … …  
    468469    final ItemQuery<ItemList> query = ItemList.getQuery();
    469470    dc = sc.newDbControl();
    470     cc.configureQuery(dc, query, true);
     471    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     472    cc.configureQuery(dc, query, jspContext, true);
    471473    cc.setQuery(query);
    472     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    473474    ExtensionsInvoker<ListColumnAction<ItemList,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    474475    listInvoker.render(new ListColumnExportRenderer<ItemList>(cc));
    … …  
    488489    final ItemQuery<ItemList> query = ItemList.getQuery();
    489490    dc = sc.newDbControl();
    490     cc.configureQuery(dc, query, true);
     491    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     492    cc.configureQuery(dc, query, jspContext, true);
    491493    dc.close();
    492494    cc.setQuery(query);

  • trunk/www/views/itemlists/list_lists.jsp

    r7913 r7914  
    134134    annotationLoaders.add(new AnnotationLoaderUtil(dc, manager, at));
    135135  }
     136  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    136137  try
    137138  {
    138     final ItemQuery<ItemList> query = Base.getConfiguredQuery(dc, cc, true, ItemList.getQuery(), mode);
     139    final ItemQuery<ItemList> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ItemList.getQuery(), mode);
    139140    lists = query.iterate(dc);
    140141  }
    … …  
    145146  int numListed = 0;
    146147  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    147   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    148148  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    149149  ExtensionsInvoker<ListColumnAction<ItemList,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/itemlists/members/index.jsp

    r7834 r7914  
    171171    final ItemQuery<? extends Listable> query = list.getMembers();
    172172    dc = sc.newDbControl();
    173     cc.configureQuery(dc, query, true);
     173    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     174    cc.configureQuery(dc, query, jspContext, true);
    174175    cc.setQuery(query);
    175     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    176176    ExtensionsInvoker<ListColumnAction<Listable,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    177177    listInvoker.render(new ListColumnExportRenderer<Listable>(cc));
    … …  
    184184    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subContext, pageContext, defaultContext);
    185185    final ItemQuery<? extends Listable> query = list.getMembers();
    186     cc.configureQuery(dc, query, true);
     186    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     187    cc.configureQuery(dc, query, jspContext, true);
    187188    cc.setQuery(query);
    188189    dc.close();
    … …  
    194195    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subContext, pageContext, defaultContext);
    195196    final ItemQuery<? extends BasicItem> query = list.getMembers();
    196     cc.configureQuery(dc, query, true);
     197    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     198    cc.configureQuery(dc, query, jspContext, true);
    197199    cc.setQuery(query);
    198200    dc.close();

  • trunk/www/views/itemlists/members/list_members.jsp

    r7913 r7914  
    151151
    152152  final Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     153  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, list);
    153154  try
    154155  {
    155156    final ItemQuery<? extends Listable> query = list.getMembers();
    156     cc.configureQuery(dc, query, true);
     157    cc.configureQuery(dc, query, jspContext, true);
    157158    members = query.iterate(dc);
    158159  }
    … …  
    165166
    166167  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    167   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, list);
    168168  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    169169  ExtensionsInvoker<ListColumnAction<Listable,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/jobs/index.jsp

    r7604 r7914  
    254254    final ItemQuery<Job> query = Job.getQuery();
    255255    dc = sc.newDbControl();
    256     cc.configureQuery(dc, query, true);
     256    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     257    cc.configureQuery(dc, query, jspContext, true);
    257258    registerExportUtils(cc);
    258259    cc.setQuery(query);
    259     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    260260    ExtensionsInvoker<ListColumnAction<Job,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    261261    listInvoker.render(new ListColumnExportRenderer<Job>(cc));
    … …  
    276276    final ItemQuery<Job> query = Job.getQuery();
    277277    dc = sc.newDbControl();
    278     cc.configureQuery(dc, query, true);
     278    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     279    cc.configureQuery(dc, query, jspContext, true);
    279280    dc.close();
    280281    cc.setQuery(query);
    … …  
    293294    final ItemQuery<Job> query = Job.getQuery();
    294295    dc = sc.newDbControl();
    295     cc.configureQuery(dc, query, true);
     296    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     297    cc.configureQuery(dc, query, jspContext, true);
    296298    dc.close();
    297299    cc.setQuery(query);

  • trunk/www/views/jobs/list_jobs.jsp

    r7913 r7914  
    131131
    132132  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     133  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    133134  try
    134135  {
    135     final ItemQuery<Job> query = Base.getConfiguredQuery(dc, cc, true, Job.getQuery(), mode);
     136    final ItemQuery<Job> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Job.getQuery(), mode);
    136137    jobs = query.iterate(dc);
    137138  }
    … …  
    143144  int numListed = 0;
    144145  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    145   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    146146  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    147147  ExtensionsInvoker<ListColumnAction<Job,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/permissiontemplates/index.jsp

    r7605 r7914  
    264264    final ItemQuery<PermissionTemplate> query = PermissionTemplate.getQuery();
    265265    dc = sc.newDbControl();
    266     cc.configureQuery(dc, query, true);
     266    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     267    cc.configureQuery(dc, query, jspContext, true);
    267268    cc.setQuery(query);
    268     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    269269    ExtensionsInvoker<ListColumnAction<PermissionTemplate,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    270270    listInvoker.render(new ListColumnExportRenderer<PermissionTemplate>(cc));
    … …  
    284284    final ItemQuery<PermissionTemplate> query = PermissionTemplate.getQuery();
    285285    dc = sc.newDbControl();
    286     cc.configureQuery(dc, query, true);
     286    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     287    cc.configureQuery(dc, query, jspContext, true);
    287288    dc.close();
    288289    cc.setQuery(query);
    … …  
    301302    final ItemQuery<PermissionTemplate> query = PermissionTemplate.getQuery();
    302303    dc = sc.newDbControl();
    303     cc.configureQuery(dc, query, true);
     304    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     305    cc.configureQuery(dc, query, jspContext, true);
    304306    dc.close();
    305307    cc.setQuery(query);

  • trunk/www/views/permissiontemplates/list_templates.jsp

    r7913 r7914  
    8080  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    8181  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     82  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8283  try
    8384  {
    84     final ItemQuery<PermissionTemplate> query = Base.getConfiguredQuery(dc, cc, true, PermissionTemplate.getQuery(), mode);
     85    final ItemQuery<PermissionTemplate> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PermissionTemplate.getQuery(), mode);
    8586    templates = query.iterate(dc);
    8687  }
    … …  
    9192  }
    9293  int numListed = 0;
    93   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9494  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9595  ExtensionsInvoker<ListColumnAction<PermissionTemplate,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/physicalbioassays/index.jsp

    r7813 r7914  
    394394    final ItemQuery<PhysicalBioAssay> query = PhysicalBioAssay.getQuery();
    395395    dc = sc.newDbControl();
    396     cc.configureQuery(dc, query, true);
     396    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     397    cc.configureQuery(dc, query, jspContext, true);
    397398    cc.setQuery(query);
    398399    registerExportUtils(cc);
    399     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    400400    ExtensionsInvoker<ListColumnAction<PhysicalBioAssay,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    401401    listInvoker.render(new ListColumnExportRenderer<PhysicalBioAssay>(cc));
    … …  
    416416    final ItemQuery<PhysicalBioAssay> query = PhysicalBioAssay.getQuery();
    417417    dc = sc.newDbControl();
    418     cc.configureQuery(dc, query, true);
     418    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     419    cc.configureQuery(dc, query, jspContext, true);
    419420    dc.close();
    420421    cc.setQuery(query);
    … …  
    433434    final ItemQuery<PhysicalBioAssay> query = PhysicalBioAssay.getQuery();
    434435    dc = sc.newDbControl();
    435     cc.configureQuery(dc, query, true);
     436    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     437    cc.configureQuery(dc, query, jspContext, true);
    436438    dc.close();
    437439    cc.setQuery(query);
    … …  
    449451    final ItemQuery<PhysicalBioAssay> query = PhysicalBioAssay.getQuery();
    450452    dc = sc.newDbControl();
    451     cc.configureQuery(dc, query, true);
     453    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     454    cc.configureQuery(dc, query, jspContext, true);
    452455    dc.close();
    453456    cc.setQuery(query);
    … …  
    459462    final ItemQuery<PhysicalBioAssay> query = PhysicalBioAssay.getQuery();
    460463    dc = sc.newDbControl();
    461     cc.configureQuery(dc, query, true);
     464    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     465    cc.configureQuery(dc, query, jspContext, true);
    462466    dc.close();
    463467    cc.setQuery(query);

  • trunk/www/views/physicalbioassays/list_bioassays.jsp

    r7913 r7914  
    151151 
    152152  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     153  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    153154  try
    154155  {
    155     final ItemQuery<PhysicalBioAssay> query = Base.getConfiguredQuery(dc, cc, true, PhysicalBioAssay.getQuery(), mode);
     156    final ItemQuery<PhysicalBioAssay> query = Base.getConfiguredQuery(dc, cc, jspContext, true, PhysicalBioAssay.getQuery(), mode);
    156157    bioAssays = query.iterate(dc);
    157158  }
    … …  
    164165  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    165166  Formatter<Number> numericFormatter = FormatterFactory.getNumberFormatter(sc);
    166   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    167167  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    168168  ExtensionsInvoker<ListColumnAction<PhysicalBioAssay,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/rawbioassays/index.jsp

    r7903 r7914  
    576576    final ItemQuery<RawBioAssay> query = RawBioAssay.getQuery();
    577577    dc = sc.newDbControl();
    578     cc.configureQuery(dc, query, true);
     578    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     579    cc.configureQuery(dc, query, jspContext, true);
    579580    dc.close();
    580581    cc.setQuery(query);
    … …  
    586587    final ItemQuery<RawBioAssay> query = RawBioAssay.getQuery();
    587588    dc = sc.newDbControl();
    588     cc.configureQuery(dc, query, true);
     589    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     590    cc.configureQuery(dc, query, jspContext, true);
    589591    dc.close();
    590592    cc.setQuery(query);

  • trunk/www/views/rawbioassays/rawdata/index.jsp

    r7604 r7914  
    119119    query.join(Hql.leftJoin(null, "reporter", "r", null, true));
    120120    query.join(Hql.leftJoin(null, "feature", "f", null, true));
    121     cc.configureQuery(dc, query, true);
     121    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType, rawDataType.getId()), null);
     122    cc.configureQuery(dc, query, jspContext, true);
    122123    cc.setQuery(query);
    123124    registerExportFormatters(cc);
    124     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType, rawDataType.getId()), null);
    125125    ExtensionsInvoker<ListColumnAction<RawData,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    126126    listInvoker.render(new ListColumnExportRenderer<RawData>(cc));
    … …  
    134134    query.join(Hql.leftJoin(null, "reporter", "r", null, true));
    135135    query.join(Hql.leftJoin(null, "feature", "f", null, true));
    136     cc.configureQuery(dc, query, true);
     136    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType, rawDataType.getId()), null);
     137    cc.configureQuery(dc, query, jspContext, true);
    137138    cc.setQuery(query);
    138139    redirect = "../../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&subcontext="+rawDataType.getId()+"&context_type=LIST&title=Import+raw+data";
    … …  
    145146    query.join(Hql.leftJoin(null, "reporter", "r", null, true));
    146147    query.join(Hql.leftJoin(null, "feature", "f", null, true));
    147     cc.configureQuery(dc, query, true);
     148    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType, rawDataType.getId()), null);
     149    cc.configureQuery(dc, query, jspContext, true);
    148150    cc.setQuery(query);
    149151    redirect = "../../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&subcontext="+rawDataType.getId()+"&context_type=LIST&main_type=OTHER&title=Run+plugin";
    … …  
    155157    query.join(Hql.leftJoin("reporter", "r"));
    156158    query.join(Hql.leftJoin("feature", "f"));
    157     cc.configureQuery(dc, query, true);
     159    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType, rawDataType.getId()), null);
     160    cc.configureQuery(dc, query, jspContext, true);
    158161    cc.setQuery(query);
    159162    redirect = "../../../views/reporterlists/index.jsp?ID="+ID+

  • trunk/www/views/rawbioassays/rawdata/list_rawdata.jsp

    r7913 r7914  
    105105
    106106  final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subContext, null, null);
     107  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, rawBioAssay);
    107108
    108109  final DataQuery<RawData> query = rawBioAssay.getRawData();
    109110  query.join(Hql.leftJoin(null, "reporter", "r", null, true));
    110111  query.join(Hql.leftJoin(null, "feature", "f", null, true));
    111   cc.configureQuery(dc, query, true);
     112  cc.configureQuery(dc, query, jspContext, true);
    112113  if (!"row".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("row")));
    113114  if (!"column".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("column")));
    … …  
    154155  final boolean writeReporterPermission = sc.hasPermission(Permission.WRITE, Item.REPORTER);
    155156  Formatter<Date> dateFormatter = FormatterFactory.getDateTimeFormatter(sc);
    156   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, rawBioAssay);
    157157  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    158158  ExtensionsInvoker<ListColumnAction<RawData,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/reporterlists/index.jsp

    r7605 r7914  
    388388    final ItemQuery<ReporterList> query = ReporterList.getQuery();
    389389    dc = sc.newDbControl();
    390     cc.configureQuery(dc, query, true);
     390    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     391    cc.configureQuery(dc, query, jspContext, true);
    391392    cc.setQuery(query);
    392     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    393393    ExtensionsInvoker<ListColumnAction<ReporterList,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    394394    listInvoker.render(new ListColumnExportRenderer<ReporterList>(cc));
    … …  
    408408    final ItemQuery<ReporterList> query = ReporterList.getQuery();
    409409    dc = sc.newDbControl();
    410     cc.configureQuery(dc, query, true);
     410    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     411    cc.configureQuery(dc, query, jspContext, true);
    411412    dc.close();
    412413    cc.setQuery(query);
    … …  
    425426    final ItemQuery<ReporterList> query = ReporterList.getQuery();
    426427    dc = sc.newDbControl();
    427     cc.configureQuery(dc, query, true);
     428    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     429    cc.configureQuery(dc, query, jspContext, true);
    428430    dc.close();
    429431    cc.setQuery(query);

  • trunk/www/views/reporterlists/list_reporterlists.jsp

    r7913 r7914  
    8383  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    8484  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     85  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    8586  try
    8687  {
    87     final ItemQuery<ReporterList> query = Base.getConfiguredQuery(dc, cc, true, ReporterList.getQuery(), mode);
     88    final ItemQuery<ReporterList> query = Base.getConfiguredQuery(dc, cc, jspContext, true, ReporterList.getQuery(), mode);
    8889    reporterLists = query.iterate(dc);
    8990  }
    … …  
    9394  }
    9495  int numListed = 0;
    95   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9696  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    9797  ExtensionsInvoker<ListColumnAction<ReporterList,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/reporterlists/reporters/index.jsp

    r7604 r7914  
    128128    final ReporterScoreQuery query = reporterList.getReporterScores();
    129129    query.join(Hql.innerJoin(null, "reporter", "rpt", true));
    130     cc.configureQuery(dc, query, true);
     130    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     131    cc.configureQuery(dc, query, jspContext, true);
    131132    cc.setQuery(query);
    132     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    133133    ExtensionsInvoker<ListColumnAction<ReporterScore,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    134134    listInvoker.render(new ListColumnExportRenderer<ReporterScore>(cc));
    … …  
    144144    final ReporterScoreQuery query = reporterList.getReporterScores();
    145145    query.join(Hql.innerJoin(null, "reporter", "rpt", true));
    146     cc.configureQuery(dc, query, true);
     146    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     147    cc.configureQuery(dc, query, jspContext, true);
    147148    dc.close();
    148149    cc.setQuery(query);
    … …  
    157158    final ReporterScoreQuery query = reporterList.getReporterScores();
    158159    query.join(Hql.innerJoin(null, "reporter", "rpt", true));
    159     cc.configureQuery(dc, query, true);
     160    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     161    cc.configureQuery(dc, query, jspContext, true);
    160162    dc.close();
    161163    cc.setQuery(query);

  • trunk/www/views/reporterlists/reporters/list_reporters.jsp

    r7913 r7914  
    102102  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
    103103
     104  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, reporterList);
    104105  try
    105106  {
    106     cc.configureQuery(dc, query, true);
     107    cc.configureQuery(dc, query, jspContext, true);
    107108    reporters = query.iterate(dc);
    108109  }
    … …  
    115116  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    116117  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    117   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, reporterList);
    118118  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    119119  ExtensionsInvoker<ListColumnAction<ReporterScore,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/reporters/index.jsp

    r7703 r7914  
    253253    final DataQuery<ReporterData> query = Reporter.getQuery();
    254254    dc = sc.newDbControl();
    255     cc.configureQuery(dc, query, true);
     255    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     256    cc.configureQuery(dc, query, jspContext, true);
    256257    cc.setQuery(query);
    257     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    258258    ExtensionsInvoker<ListColumnAction<ReporterData,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    259259    listInvoker.render(new ListColumnExportRenderer<ReporterData>(cc));
    … …  
    273273    final DataQuery<ReporterData> query = Reporter.getQuery();
    274274    dc = sc.newDbControl();
    275     cc.configureQuery(dc, query, true);
     275    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     276    cc.configureQuery(dc, query, jspContext, true);
    276277    dc.close();
    277278    cc.setQuery(query);
    … …  
    290291    final DataQuery<ReporterData> query = Reporter.getQuery();
    291292    dc = sc.newDbControl();
    292     cc.configureQuery(dc, query, true);
     293    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     294    cc.configureQuery(dc, query, jspContext, true);
    293295    dc.close();
    294296    cc.setQuery(query);
    … …  
    306308    final DataQuery<ReporterData> query = Reporter.getQuery();
    307309    dc = sc.newDbControl();
    308     cc.configureQuery(dc, query, true);
     310    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     311    cc.configureQuery(dc, query, jspContext, true);
    309312    dc.close();
    310313    cc.setQuery(query);

  • trunk/www/views/reporters/list_reporters.jsp

    r7913 r7914  
    9090{
    9191  final DataQuery<ReporterData> query = Reporter.getQuery();
    92   cc.configureQuery(dc, query, true);
     92  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
     93  cc.configureQuery(dc, query, jspContext, true);
    9394
    9495  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
    … …  
    109110  Formatter<Date> timeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    110111  Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
    111   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    112112  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    113113  ExtensionsInvoker<ListColumnAction<ReporterData,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);

  • trunk/www/views/sessions/index.jsp

    r7815 r7914  
    132132      null : User.getById(dc, sc.getLoggedInUserId());
    133133    final ItemQuery<Session> query = Session.getQuery(user);
    134     cc.configureQuery(dc, query, true);
     134    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     135    cc.configureQuery(dc, query, jspContext, true);
    135136    cc.setQuery(query);
    136     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
    137137    ExtensionsInvoker<ListColumnAction<Session,?>> listInvoker = ListColumnUtil.useExtensions(jspContext);
    138138    listInvoker.render(new ListColumnExportRenderer<Session>(cc));
    … …  
    154154    final ItemQuery<Session> query = Session.getQuery(user);
    155155    dc = sc.newDbControl();
    156     cc.configureQuery(dc, query, true);
     156    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
     157    cc.configureQuery(dc, query, jspContext, true);
    157158    dc.close();
    158159    cc.setQuery(query);

  • trunk/www/views/sessions/list_sessions.jsp

    r7913 r7914  
    8888
    8989  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
     90  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    9091  try
    9192  {
    92     final ItemQuery<Session> query = Base.getConfiguredQuery(dc, cc, true, Session.getQuery(cc.getInclude().contains(Include.OTHERS) ? null : user), mode);
     93    final ItemQuery<Session> query = Base.getConfiguredQuery(dc, cc, jspContext, true, Session.getQuery(cc.getInclude().contains(Include.OTHERS) ? null : user), mode);
    9394    sessions = query.iterate(dc);
    9495  }
    … …  
    99100  int numListed = 0;
    100101  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
    101   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    102102  ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
    103103  ExtensionsInvoker<ListColumnAction<Session,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
Note: See TracChangeset for help on using the changeset viewer.