diff --git a/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/WebAdminInterface.java b/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/WebAdminInterface.java index 3f7d683b466..1af0dc216c2 100644 --- a/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/WebAdminInterface.java +++ b/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/WebAdminInterface.java @@ -5,9 +5,7 @@ import org.apache.wicket.Session; import org.apache.wicket.authorization.strategies.CompoundAuthorizationStrategy; import org.apache.wicket.authorization.strategies.page.SimplePageAuthorizationStrategy; -import org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy; import org.apache.wicket.authroles.authorization.strategies.role.RoleAuthorizationStrategy; -import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.core.request.mapper.CryptoMapper; import org.apache.wicket.protocol.http.WebApplication; @@ -25,10 +23,8 @@ import java.util.List; import dmg.cells.nucleus.CellEndpoint; -import dmg.cells.nucleus.CellMessageReceiver; import dmg.cells.nucleus.CellMessageSender; import dmg.cells.nucleus.CellPath; - import org.dcache.auth.LoginStrategy; import org.dcache.cells.CellStub; import org.dcache.services.login.RemoteLoginStrategy; diff --git a/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/pages/basepage/SortableBasePage.java b/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/pages/basepage/SortableBasePage.java index ff419c7e51d..3987bf4e26b 100644 --- a/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/pages/basepage/SortableBasePage.java +++ b/modules/dcache-webadmin/src/main/java/org/dcache/webadmin/view/pages/basepage/SortableBasePage.java @@ -22,14 +22,16 @@ protected void renderHeadInternal(IHeaderResponse response) { } protected void addFilterSelectScript(String id, IHeaderResponse response) { - response.render(OnLoadHeaderItem - .forScript(" $('.sortable-" + id + "').tablesorter();\n" - + " // Initialise Plugin\n" - + " var options1 = {\n" - + " additionalFilterTriggers: [$('.quickfind-" + id + "')],\n" - + " clearFiltersControls: [$('.cleanfilters-" + id + "')],\n" - + " };\n" - + " $('.sortable-" + id + "').tableFilter(options1);\n")); + StringBuilder script = new StringBuilder(); + script.append("picnet.ui.filter.GenericListFilterOptions.prototype['enableCookies']") + .append( " = false;\n") + .append("$('.sortable-" + id + "').tablesorter();\n") + .append("var options1 = {\n") + .append(" additionalFilterTriggers: [$('.quickfind-" + id + "')],\n") + .append(" clearFiltersControls: [$('.cleanfilters-" + id + "')],\n") + .append("}\n") + .append("$('.sortable-" + id + "').tableFilter(options1);\n"); + response.render(OnLoadHeaderItem.forScript(script.toString())); } @Override