From 5b94c4decf6ac7d563b81e895c55c68c8a7f2561 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Wed, 14 Jan 2015 00:47:50 -0800 Subject: [PATCH] disable paginate and filter of site list in tenant view --- planetstack/core/xoslib/static/js/xosTenant.js | 4 +++- planetstack/core/xoslib/static/js/xoslib/xosHelper.js | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/planetstack/core/xoslib/static/js/xosTenant.js b/planetstack/core/xoslib/static/js/xosTenant.js index 48ac835..268b8ca 100644 --- a/planetstack/core/xoslib/static/js/xosTenant.js +++ b/planetstack/core/xoslib/static/js/xosTenant.js @@ -102,7 +102,7 @@ XOSTenantApp.buildViews = function() { tenantSummaryClass = XOSDetailView.extend({template: "#xos-detail-template", app: XOSTenantApp, detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"], - fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image"}, + fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"}, }); XOSTenantApp.tenantSummaryView = tenantSummaryClass; @@ -125,6 +125,8 @@ XOSTenantApp.buildViews = function() { title: "sites", inputType: {allocated: "spinner"}, noDeleteColumn: true, + disablePaginate: true, + disableFilter: true, }); XOSTenantApp.tenantSiteListView = tenantSiteListClass; diff --git a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js index 07ae9a9..b479e87 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js +++ b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js @@ -913,6 +913,8 @@ XOSDataTableView = Marionette.View.extend( { "bJQueryUI": true, "bStateSave": true, "bServerSide": true, + "bFilter": ! (view.options.disableFilter || view.disableFilter), + "bPaginate": ! (view.options.disablePaginate || view.disablePaginate), "aoColumns": view.columnsByIndex, fnServerData: function(sSource, aoData, fnCallback, settings) { -- 2.43.0