From 3798a963e5939bb55a46e2d58adc1efad387a2da Mon Sep 17 00:00:00 2001 From: hltaylor26 <79609783+hltaylor26@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:18:48 -0400 Subject: [PATCH 1/2] Use different endpoint for getting filter values in efficiency tab filter search. --- html/gui/js/modules/efficiency/FilterPanel.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/html/gui/js/modules/efficiency/FilterPanel.js b/html/gui/js/modules/efficiency/FilterPanel.js index cee1b8acd..cb282cf53 100644 --- a/html/gui/js/modules/efficiency/FilterPanel.js +++ b/html/gui/js/modules/efficiency/FilterPanel.js @@ -401,21 +401,19 @@ XDMoD.Module.Efficiency.FilterPanel = Ext.extend(Ext.Panel, { lazyRender: true, hideTrigger: true, store: new Ext.data.JsonStore({ - url: 'controllers/metric_explorer.php', + proxy: new Ext.data.HttpProxy({ + url: XDMoD.REST.url + '/warehouse/dimensions/' + dimension.toLowerCase(), + method: 'GET' + }), + baseParams: { + realm: 'SUPREMM', + }, fields: ['checked', 'name', 'id'], - root: 'data', + root: 'results', totalProperty: 'totalCount', autoLoad: true, idProperty: 'name', messageProperty: 'message', - baseParams: { - operation: 'get_dimension', - dimension_id: dimension.toLowerCase(), - realm: 'SUPREMM', - start: 0, - limit: 1000, - public_user: CCR.xdmod.publicUser - } }), listeners: { select: function (e) { From cf8e27b28e7914bb0a429cff2e24f556db8518d0 Mon Sep 17 00:00:00 2001 From: hltaylor26 <79609783+hltaylor26@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:42:06 -0400 Subject: [PATCH 2/2] Remove trailing commas --- html/gui/js/modules/efficiency/FilterPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/gui/js/modules/efficiency/FilterPanel.js b/html/gui/js/modules/efficiency/FilterPanel.js index cb282cf53..cbb59dcf5 100644 --- a/html/gui/js/modules/efficiency/FilterPanel.js +++ b/html/gui/js/modules/efficiency/FilterPanel.js @@ -406,14 +406,14 @@ XDMoD.Module.Efficiency.FilterPanel = Ext.extend(Ext.Panel, { method: 'GET' }), baseParams: { - realm: 'SUPREMM', + realm: 'SUPREMM' }, fields: ['checked', 'name', 'id'], root: 'results', totalProperty: 'totalCount', autoLoad: true, idProperty: 'name', - messageProperty: 'message', + messageProperty: 'message' }), listeners: { select: function (e) {