summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean Fridman <fridman@mail.sfsu.edu>2015-07-09 18:13:00 -0400
committerSean Fridman <fridman@mail.sfsu.edu>2015-07-09 18:17:33 -0400
commitc2761e84bb496c401c677dcdc768c142cb22a326 (patch)
tree40e68f5cd0783bb20d0d75bef45606520d006c24 /app
parent42fe17f3e52be163a506bf9a3953aa8adb5fd64f (diff)
Allow custom resource sorting on admin page
Diffstat (limited to 'app')
-rw-r--r--app/node_modules/okadminview/index.js23
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) {