diff options
| -rw-r--r-- | app/node_modules/okadminview/index.js | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js index 924f5a5..273d541 100644 --- a/app/node_modules/okadminview/index.js +++ b/app/node_modules/okadminview/index.js @@ -81,12 +81,25 @@ function OKAdminView(options) { var id = resource.getID(staticData); // Check to see if there's a more specific instance resource = resourceCache.get(type, id) || resource; - var resourceOptions = dashboardResourceConfig[type] || {} - var groupBy = resourceOptions.groupBy + var dashConf = dashboardResourceConfig[type] || {} + var groupBy = dashConf.groupBy + var sortBy = dashConf.sortBy + var descending = dashConf.descending if (resource.bound) { - return OKQuery({resource: resource, groupBy: groupBy}) + return OKQuery({ + resource: resource, + groupBy: groupBy, + sortBy: sortBy, + descending: descending + }) } else { - return OKQuery({resource: resource, query: config.query, groupBy: groupBy}) + return OKQuery({ + resource: resource, + query: config.query, + groupBy: groupBy, + sortBy: sortBy, + descending: descending + }) } }); @@ -321,7 +334,7 @@ OKAdminView.prototype.renderResourceNew = function(req, res, data) { * Annotate template data with schema info */ function fetchIndexTemplateData(meta, queries, dashboardConfig) { - var resourceConfig = dashboardConfig.resources + var resourceConfig = dashboardConfig.resources || {} return Q.promise(function(resolve, reject) { Q.all(queries.map(function(query) { |