From 70591083a1f7ea9ecf511b62d6a0a010a8da8c24 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 13:04:00 -0400
Subject: Stray console.log

---
 app/node_modules/okquery/index.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 33a49c4..2d93e2a 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -67,7 +67,6 @@ function queryComplex(resource, query) {
 
   if (notDynamic) {
     return function() {
-      console.log('get it!', query)
       return resource.find(query);
     }
   } else {
@@ -75,7 +74,6 @@ function queryComplex(resource, query) {
       var dynamicQuery = {};
       dynamicQuery[dynamicProp] = id;
       var query = assign({}, query, dynamicQuery);
-      console.log('get it!', query)
       return resource.find(query);
     }
   }
-- 
cgit v1.2.3-70-g09d2


From e01c2a20352d252e40ea133d0f4665b2e7513582 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 18:48:10 -0400
Subject: Lil fixes + defensive programming

---
 app/node_modules/okadminview/index.js     | 28 +++++++++++++++++-----------
 app/node_modules/okadminview/package.json |  1 +
 app/node_modules/okquery/index.js         |  9 +++++++++
 app/node_modules/okquery/package.json     |  1 +
 app/node_modules/okserver/index.js        | 10 ----------
 5 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index a376df5..05e2251 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -1,4 +1,5 @@
-var assign = require('object-assign')
+var assign = require('object-assign');
+var cloneDeep = require('lodash.clonedeep');
 var bodyParser = require('body-parser');
 var methodOverride = require('method-override');
 var Q = require('q');
@@ -22,12 +23,14 @@ function OKAdminView(options) {
     throw new Error('No templateProvider provided to OKAdminView');
   if (!options.meta)
     throw new Error('No meta query provided to OKAdminView');
+
   var app = options.app;
   var express = options.express;
   var meta = options.meta;
   var resourceCache = this._resourceCache = options.resourceCache;
-  var resourceConfig = this._resourceConfig = options.resourceConfig;
+  var resourceConfig = this._resourceConfig = cloneDeep(options.resourceConfig);
   var provider = options.templateProvider;
+
   // Load templates
   var templates = this._templates =
       ['index', 'resource', 'resource_new'].reduce(function(cache, name) {
@@ -37,6 +40,7 @@ function OKAdminView(options) {
     cache[name] = template;
     return cache;
   }, {});
+
   // OKAdmin middleware is a router, so mounts on 'use'
   Object.defineProperty(this, 'mount', {
     value: 'use',
@@ -120,13 +124,14 @@ function OKAdminView(options) {
           resource: resource,
           query: id
         });
-        fetchResourceTemplateData(meta, query, getResourceTemplateData).then(function(data) {
-          if (!data) {
-            resourceMissingHandler(req, res)()
-          } else {
-            view.renderResource(req, res, data);
-          }
-        }).fail(errorHandler(req, res));
+        fetchResourceTemplateData(meta, query, getResourceTemplateData)
+            .then(function(data) {
+              if (!data) {
+                resourceMissingHandler(req, res)()
+              } else {
+                view.renderResource(req, res, data);
+              }
+            }).fail(errorHandler(req, res));
       }
 
     });
@@ -201,6 +206,7 @@ function getResourceTemplateData(meta, resource, data) {
   meta = meta || {};
   resource = resource || {};
   data = data || {};
+  // Decorate spec with actual resource values
   var spec = Object.keys(resource.spec).reduce(function(cache, prop) {
     var value = data[prop];
     cache[prop].value = value;
@@ -245,7 +251,7 @@ OKAdminView.prototype.renderResourceNew = function(req, res, data) {
  * Annotate template data with schema info
  */
 function fetchIndexTemplateData(meta, queries) {
-  return Q.Promise(function(resolve, reject) {
+  return Q.promise(function(resolve, reject) {
     Q.all([meta.get()].concat(queries.map(function(query) {
       return query.get();
     }))).then(function(results) {
@@ -293,7 +299,7 @@ function fetchIndexTemplateData(meta, queries) {
  */
 function fetchResourceTemplateData(meta, query, fn) {
   fn = fn || function(m, r, d) { return {meta: m, resource: d}; };
-  return Q.Promise(function(resolve, reject) {
+  return Q.promise(function(resolve, reject) {
     meta.get().then(function(metadata) {
       query.get().then(function(data) {
         var resource = query.resource;
diff --git a/app/node_modules/okadminview/package.json b/app/node_modules/okadminview/package.json
index 4832db1..c428645 100644
--- a/app/node_modules/okadminview/package.json
+++ b/app/node_modules/okadminview/package.json
@@ -10,6 +10,7 @@
   "license": "None",
   "dependencies": {
     "body-parser": "^1.12.2",
+    "lodash.clonedeep": "^3.0.0",
     "method-override": "^2.3.2",
     "object-assign": "^2.0.0",
     "pluralize": "^1.1.2",
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 2d93e2a..89c8b73 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -1,3 +1,4 @@
+var cloneDeep = require('lodash.clonedeep');
 var assign = require('object-assign');
 var isobject = require('lodash.isobject');
 var Q = require('q');
@@ -16,6 +17,9 @@ function OKQuery(options) {
   var resource = options.resource;
   var type = resource.type;
   var query = options.query || '*';
+  // Ensure immutability
+  if (isobject(query))
+    query = cloneDeep(query);
 
   Object.defineProperty(this, 'resource', {
     value: resource,
@@ -55,6 +59,9 @@ function createQuery(resource, query, options) {
 
 function queryComplex(resource, query) {
   var dynamicProp;
+  // Query is an object specifying key value pairs against which
+  // to match DB entries. Iterate through and check if any of the values
+  // is unbound e.g. :id
   var notDynamic = Object.keys(query).every(function(prop) {
     var matcher = query[prop];
     if (isDynamic(matcher)) {
@@ -71,6 +78,8 @@ function queryComplex(resource, query) {
     }
   } else {
     return function(id) {
+      // Bind the dynamic property to its value
+      // and add the pair to the query
       var dynamicQuery = {};
       dynamicQuery[dynamicProp] = id;
       var query = assign({}, query, dynamicQuery);
diff --git a/app/node_modules/okquery/package.json b/app/node_modules/okquery/package.json
index 606d45b..5ba9dd5 100644
--- a/app/node_modules/okquery/package.json
+++ b/app/node_modules/okquery/package.json
@@ -9,6 +9,7 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
+    "lodash.clonedeep": "^3.0.0",
     "lodash.isobject": "^3.0.1",
     "object-assign": "^2.0.0",
     "q": "^1.2.0"
diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 1645eaa..cf06b3c 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -67,16 +67,6 @@ function OKServer(options) {
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
   app.use(slash());
-
-  /**
-   * Create a handler which redirect all requests to
-   * the same route with a trailing slash appended
-   */
-  function redirect(routeNoSlash) {
-    return function(req, res) {
-      res.redirect(301, routeNoSlash + '/');
-    }
-  }
 }
 
 OKServer.prototype.listen = function listen(port) {
-- 
cgit v1.2.3-70-g09d2


From 4021d7846ce164f3f0c3cb37d3a1d82d2de489d9 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Apr 2015 23:09:05 -0400
Subject: Give views sorted resources

---
 app/node_modules/okdb/index.js       | 11 +++++++++++
 app/node_modules/okquery/index.js    |  3 ++-
 app/node_modules/okresource/index.js | 11 ++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/node_modules/okdb/index.js b/app/node_modules/okdb/index.js
index 7639ec6..c00087c 100644
--- a/app/node_modules/okdb/index.js
+++ b/app/node_modules/okdb/index.js
@@ -117,6 +117,17 @@ FSDB.prototype.remove = function(collection, id) {
   }
 };
 
+FSDB.prototype.sortBy = function(collection, prop, descend) {
+  var schema = this._schemas[collection];
+  if (!schema)
+    return resolve(null, new Error('No such collection type'));
+  if (!prop)
+    return resolve(null, new Error('Bad input'));
+
+  var result = this._db(collection).sortByOrder([prop], [!descend]);
+  return resolve(result);
+};
+
 FSDB.prototype.find = function(collection, id) {
   var schema = this._schemas[collection];
   if (!schema)
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 89c8b73..9cc8b78 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -96,7 +96,8 @@ function queryDynamic(resource) {
 
 function queryAll(resource) {
   return function() {
-    return resource.all();
+    // Always return sorted results
+    return resource.sortBy('__index');
   };
 }
 
diff --git a/app/node_modules/okresource/index.js b/app/node_modules/okresource/index.js
index df89617..8c0bb16 100644
--- a/app/node_modules/okresource/index.js
+++ b/app/node_modules/okresource/index.js
@@ -122,12 +122,21 @@ OKResource.prototype.update = function(id, data) {
       reject(new Error('No resource ID provided'));
     } else if (!data) {
       reject(new Error('No data provided'));
-    }else {
+    } else {
       db.update(type, id, data).then(resolve).fail(reject);;
     }
   });
 };
 
+
+/**
+ * Get all documents in collection sorted by property,
+ * optionally in descending order
+ */
+OKResource.prototype.sortBy = function(prop, descend) {
+  return this._db.sortBy(this.type, prop, descend);
+};
+
 /**
  * Update all resources with the given ids with the given data
  */
-- 
cgit v1.2.3-70-g09d2


From 34f1ca02bea38e0b7ef185ebf07d3ec6df30f370 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 17:57:17 -0400
Subject: split up the projects by category, add a schema flag so we can use
 the same singular template

---
 app/index.js                      |  6 ++--
 app/node_modules/okquery/index.js |  6 ++++
 app/node_modules/okview/index.js  |  2 +-
 site/db.json                      |  8 +++--
 site/index.js                     | 67 +++++++++++++++++++++------------------
 site/templates/index.liquid       | 31 ++++++++----------
 6 files changed, 65 insertions(+), 55 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/index.js b/app/index.js
index 419adfc..7860f76 100644
--- a/app/index.js
+++ b/app/index.js
@@ -87,7 +87,6 @@ function OKCMS(options) {
       this._createResources(resourceConfig, db, schemas);
   var errorHandler = createErrorHandlerProducer(
       templateProvider, adminTemplateProvider, debug);
-
   // Create view instances from config
   var views = this._views =
       this._createViews(viewConfig, db, meta, resourceCache, templateProvider,
@@ -141,7 +140,7 @@ OKCMS.prototype._createResources = function(resourceConfig, db, schemaCache) {
     var type = config.type;
     var schema = schemaCache[type];
     if (!schema)
-      throw new Error('Resource config references nonexistent schema');
+      throw new Error('Resource config references nonexistent schema ' + type);
     var resource = OKResource({
       type: type,
       db: db,
@@ -244,7 +243,8 @@ OKCMS.prototype._createQueries = function(queryConfig, resourceCache) {
     var query = config.query || '*';
     return new OKQuery({
       resource: resource,
-      query: query
+      query: query,
+      as: config.as,
     });
   });
 };
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 9cc8b78..519bc08 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -33,6 +33,12 @@ function OKQuery(options) {
     enumerable: true
   });
 
+  Object.defineProperty(this, 'as', {
+    value: options.as,
+    writable: false,
+    enumerable: true
+  });
+
   this.get = createQuery(resource, query, {
     default: options.default
   });
diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index 63f22b5..951261c 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -139,7 +139,7 @@ function fetchTemplateData(meta, queries, id) {
             return cache;
           }
           var resource = queries[i].resource;
-          var type = queries[i].type;
+          var type = queries[i].as || queries[i].type;
           var manyResult = isarray(result);
           // Inform template of ID in generic field
           if (manyResult) {
diff --git a/site/db.json b/site/db.json
index b6fbf24..22833f1 100644
--- a/site/db.json
+++ b/site/db.json
@@ -1,9 +1,8 @@
 {
   "meta": [],
-  "project": [
+  "retail": [
     {
       "id": "diesel-ss15",
-      "category": "advertising",
       "title": "DIESEL JOGG JEANS SS15 DENIM CAMPAIGN",
       "shortname": "DIESEL SS15",
       "description": "Sed posuere consectetur est at lobortis. Donec id elit non mi porta gravida at eget metus. Cras mattis consectetur purus sit amet fermentum. Vestibulum id ligula porta felis euismod semper. Donec sed odio dui. \r\n\r\nVestibulum id ligula porta felis euismod semper. Vestibulum id ligula porta felis euismod semper. Vestibulum id ligula porta felis euismod semper. Aenean lacinia bibendum nulla sed consectetur. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. \r\n\r\nCurabitur blandit tempus porttitor. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Maecenas sed diam eget risus varius blandit sit amet non magna. Donec ullamcorper nulla non metus auctor fringilla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur blandit tempus porttitor. Maecenas sed diam eget risus varius blandit sit amet non magna.",
@@ -50,5 +49,8 @@
       "image": "http://checkingintocollege.com/wp/wp-content/uploads/2014/08/angryphone.jpg",
       "__index": 0
     }
-  ]
+  ],
+  "advertising": [],
+  "experiential": [],
+  "content": []
 }
\ No newline at end of file
diff --git a/site/index.js b/site/index.js
index dace900..8eec697 100644
--- a/site/index.js
+++ b/site/index.js
@@ -1,5 +1,14 @@
 var okcms = require('..');
 
+var projectSchema = {
+  id: {type: 'string', id: true},
+  title: {type: 'string'},
+  shortname: {type: 'string'},
+  description: {type: 'text'},
+  video: {type: 'video'},
+  images: {type: 'captioned-image-list'},
+}
+
 var app  = okcms.createApp({
 
   root: 'public',
@@ -11,26 +20,19 @@ var app  = okcms.createApp({
       body: {type: 'text'},
       image: {type: 'string'}
     },
-    project: {
-      id: {type: 'string', id: true},
-      title: {type: 'string'},
-      shortname: {type: 'string'},
-      category: {type: 'enum', options: [
-        'retail',
-        'advertising',
-        'experiential',
-        'content']
-      },
-      description: {type: 'text'},
-      video: {type: 'video'},
-      images: {type: 'captioned-image-list'},
-    }
+    retail: projectSchema,
+    advertising: projectSchema,
+    experiential: projectSchema,
+    content: projectSchema,
   },
 
   resources: [
     { type: 'page', static: {id: 'about'}},
     { type: 'page', static: {id: 'contact'}},
-    { type: 'project' }
+    { type: 'retail' },
+    { type: 'advertising' },
+    { type: 'experiential' },
+    { type: 'content' }
   ],
 
   services: {
@@ -44,8 +46,11 @@ var app  = okcms.createApp({
   views: {
     '/': {
       data: [
-        {type: 'project', query: '*'},
-        {type: 'page', query: '*'}
+        {type: 'page', query: '*'},
+        {type: 'retail', query: '*'},
+        {type: 'advertising', query: '*'},
+        {type: 'experiential', query: '*'},
+        {type: 'content', query: '*'},
       ]
     },
     '/about': {
@@ -55,17 +60,19 @@ var app  = okcms.createApp({
       data: {type: 'page', query: 'contact'}
     },
     '/all': {
-      data: {
-        type: 'project',
-        query: '*'
-      },
+      data: [
+        {type: 'retail', query: '*'},
+        {type: 'advertising', query: '*'},
+        {type: 'experiential', query: '*'},
+        {type: 'content', query: '*'},
+      ],
       template: 'all'
     },
     '/retail/:id': {
       data: {
-        type: 'project',
+        type: 'retail',
+        as: 'project',
         query: {
-          category: 'retail',
           id: ':id'
         }
       },
@@ -73,9 +80,8 @@ var app  = okcms.createApp({
     },
     '/advertising/:id': {
       data: {
-        type: 'project',
+        type: 'advertising',
         query: {
-          category: 'advertising',
           id: ':id'
         }
       },
@@ -83,9 +89,9 @@ var app  = okcms.createApp({
     },
     '/experiential/:id': {
       data: {
-        type: 'project',
+        type: 'experiential',
+        as: 'project',
         query: {
-          category: 'experiential',
           id: ':id'
         }
       },
@@ -93,12 +99,13 @@ var app  = okcms.createApp({
     },
     '/content/:id': {
       data: {
-        type: 'project',
+        type: 'content',
+        as: 'project',
         query: {
-          category: 'content',
           id: ':id'
         }
-      }
+      },
+      template: 'project'
     }
   }
 
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index 954670a..0bd6b7d 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -85,36 +85,28 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 <nav>
 	<div class="top">
 		<img src="assets/images/2H_WORDMARK.png" class="toplogo">
-		<div class="cat">RETAIL</div>
+		<div class="cat">retail</div>
 		<div class="sub">
-		  {% for project in projects %}
-        {% if project.category == 'retail' %}
-          <a href="/retail/{{ project.id }}">{{ project.shortname }}</a>
-        {% endif %}
+		  {% for project in retails %}
+        <a href="/retail/{{ project.id }}">{{ project.shortname }}</a>
       {% endfor %}
 		</div>
 		<div class="cat">advertising</div>
 		<div class="sub">
-		  {% for project in projects %}
-        {% if project.category == 'advertising' %}
-          <a href="/advertising/{{ project.id }}">{{ project.shortname }}</a>
-        {% endif %}
+		  {% for project in advertisings %}
+        <a href="/advertising/{{ project.id }}">{{ project.shortname }}</a>
       {% endfor %}
 		</div>
 		<div class="cat">experiential</div>
 		<div class="sub">
-		  {% for project in projects %}
-        {% if project.category == 'experiential' %}
-          <a href="/experiential/{{ project.id }}">{{ project.shortname }}</a>
-        {% endif %}
+		  {% for project in experientials %}
+        <a href="/experiential/{{ project.id }}">{{ project.shortname }}</a>
       {% endfor %}
 		</div>
 		<div class="cat">content</div>
 		<div class="sub">
-		  {% for project in projects %}
-        {% if project.category == 'content' %}
-          <a href="/content/{{ project.id }}">{{ project.shortname }}</a>
-        {% endif %}
+		  {% for project in contents %}
+        <a href="/content/{{ project.id }}">{{ project.shortname }}</a>
       {% endfor %}
 		</div>
 	</div>
@@ -133,7 +125,10 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 </div>
 
 <script type="text/plain" id="preload-image-list">
-{% for project in projects %}{{ project.images[0].uri }}
+{% for project in retails %}{{ project.images[0].uri }}
+{% endfor %}{% for project in advertisings %}{{ project.images[0].uri }}
+{% endfor %}{% for project in experientials %}{{ project.images[0].uri }}
+{% endfor %}{% for project in contents %}{{ project.images[0].uri }}
 {% endfor %}{% for page in pages %}{{ page.image }}
 {% endfor %}</script>
 
-- 
cgit v1.2.3-70-g09d2


From 448c3c9f0e51d2b42bf5ba9a0e96500e4e8f3dae Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Wed, 27 May 2015 12:27:29 -0400
Subject: Add query config to sort queries by field

---
 app/index.js                      |  2 ++
 app/node_modules/okquery/index.js | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/index.js b/app/index.js
index 963bfd0..8cca3ee 100644
--- a/app/index.js
+++ b/app/index.js
@@ -238,6 +238,8 @@ OKCMS.prototype._createQueries = function(queryConfig, resourceCache) {
       resource: resource,
       query: query,
       as: config.as,
+      sortBy: config.sortBy,
+      descending: config.descending
     });
   });
 };
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 519bc08..4051f95 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -21,6 +21,10 @@ function OKQuery(options) {
   if (isobject(query))
     query = cloneDeep(query);
 
+  // Queries are ordered by index by default
+  var sortField = options.sortBy || '__index';
+  var descending = options.descending || false;
+
   Object.defineProperty(this, 'resource', {
     value: resource,
     writable: false,
@@ -40,7 +44,9 @@ function OKQuery(options) {
   });
 
   this.get = createQuery(resource, query, {
-    default: options.default
+    default: options.default,
+    sortField: sortField,
+    descending : descending
   });
 }
 
@@ -53,7 +59,7 @@ function createQuery(resource, query, options) {
   } else if (isDynamic(query)) {
     query = queryDynamic(resource);
   } else if (isSet(query)) {
-    query = queryAll(resource);
+    query = queryAll(resource, options.sortField, options.descending);
   } else {
     query = querySingle(resource, query);
   }
@@ -100,10 +106,9 @@ function queryDynamic(resource) {
   };
 }
 
-function queryAll(resource) {
+function queryAll(resource, sortField, descending) {
   return function() {
-    // Always return sorted results
-    return resource.sortBy('__index');
+    return resource.sortBy(sortField, descending);
   };
 }
 
-- 
cgit v1.2.3-70-g09d2


From 42fe17f3e52be163a506bf9a3953aa8adb5fd64f Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Jul 2015 16:58:02 -0400
Subject: Implement groupBy queries + admin interface

---
 app/index.js                          | 14 ++++---
 app/node_modules/okadminview/index.js | 42 +++++++++------------
 app/node_modules/okquery/index.js     | 43 ++++++++++++++++++++-
 app/node_modules/okview/index.js      | 26 +++++++------
 themes/okadmin/public/js/app.js       | 12 +++---
 themes/okadmin/templates/index.liquid | 71 +++++++++++++++++++++++++----------
 6 files changed, 140 insertions(+), 68 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/index.js b/app/index.js
index 1c77728..d514f10 100644
--- a/app/index.js
+++ b/app/index.js
@@ -60,6 +60,7 @@ function OKCMS(options) {
     '/': { template: 'index' }
   };
   var serviceConfig = options.services || {};
+  var adminConfig = options.admin || {}
 
   var templateProvider = this._templateProvider = new OKTemplate({
     root: templateRoot,
@@ -84,7 +85,7 @@ function OKCMS(options) {
       this._createViews(viewConfig, db, meta, resourceCache, templateProvider,
           errorHandler);
   var adminViews = this._adminViews =
-      this._createAdminViews(adminPath, app, express, resourceConfig,
+      this._createAdminViews(adminConfig, adminPath, app, express, resourceConfig,
           resourceCache, adminTemplateProvider, adminMeta,
           errorHandler);
 
@@ -194,9 +195,8 @@ OKCMS.prototype._createViews = function(viewConfig, db,
   }
 };
 
-OKCMS.prototype._createAdminViews = function(path, app, express,
-  resourceConfig, resourceCache, templateProvider, meta,
-  errorHandler) {
+OKCMS.prototype._createAdminViews = function(adminConfig, path, app, express,
+  resourceConfig, resourceCache, templateProvider, meta, errorHandler) {
   var views = {};
   var withTrail = withTrailingSlash(path);
   var withoutTrail = withoutTrailingSlash(path);
@@ -221,7 +221,8 @@ OKCMS.prototype._createAdminViews = function(path, app, express,
     resourceCache: resourceCache,
     templateProvider: templateProvider,
     meta: meta,
-    errorHandler: errorHandler
+    errorHandler: errorHandler,
+    dashboardConfig: adminConfig.dashboard || {}
   });
   return views;
 };
@@ -243,7 +244,8 @@ OKCMS.prototype._createQueries = function(queryConfig, resourceCache) {
       query: query,
       as: config.as,
       sortBy: config.sortBy,
-      descending: config.descending
+      descending: config.descending,
+      groupBy: config.groupBy
     });
   });
 };
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index f6a7cdb..924f5a5 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -40,6 +40,8 @@ function OKAdminView(options) {
   if (!options.errorHandler)
     throw new Error('No error handler provided to OKAdminView');
 
+  var dashboardConfig = options.dashboardConfig || {}
+  var dashboardResourceConfig = dashboardConfig.resources || {}
   var app = options.app;
   var express = options.express;
   var meta = options.meta;
@@ -79,10 +81,12 @@ 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
     if (resource.bound) {
-      return OKQuery({resource: resource});;
+      return OKQuery({resource: resource, groupBy: groupBy})
     } else {
-      return OKQuery({resource: resource, query: config.query})
+      return OKQuery({resource: resource, query: config.query, groupBy: groupBy})
     }
   });
 
@@ -123,7 +127,7 @@ function OKAdminView(options) {
     }));
 
     router.get('/', function readIndex(req, res, next) {
-      fetchIndexTemplateData(meta, indexQueries).then(function(data) {
+      fetchIndexTemplateData(meta, indexQueries, dashboardConfig).then(function(data) {
         view.renderIndex(req, res, assign(data, {
           success: req.flash('success'),
           errors: req.flash('errors')
@@ -316,7 +320,9 @@ OKAdminView.prototype.renderResourceNew = function(req, res, data) {
 /**
  * Annotate template data with schema info
  */
-function fetchIndexTemplateData(meta, queries) {
+function fetchIndexTemplateData(meta, queries, dashboardConfig) {
+  var resourceConfig = dashboardConfig.resources
+
   return Q.promise(function(resolve, reject) {
     Q.all(queries.map(function(query) {
       return query.get();
@@ -327,27 +333,15 @@ function fetchIndexTemplateData(meta, queries) {
         var resource = queries[i].resource;
         // We want the raw object spec
         var spec = resource.spec;
-        var key = pluralize(resource.type);
-        if (!cache[key]) {
-          cache[key] = {
-            type: resource.type,
-            spec: spec,
-            data: []
-          };
-        }
-
-        if (result.length) {
-          result.forEach(addData)
-        } else {
-          addData(result);
+        var dashConf = resourceConfig[resource.type] || {}
+        var groupBy = dashConf.groupBy
+        var key = pluralize(resource.type)
+        cache[key] = {
+          type: resource.type,
+          spec: spec,
+          data: result,
+          groupBy: groupBy
         }
-
-        function addData(data) {
-          // Report id to template under standard name
-          data.id = resource.getID(data);
-          cache[key].data.push(data);
-        }
-
         return cache;
       }, {});
 
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 4051f95..09d867d 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -43,10 +43,17 @@ function OKQuery(options) {
     enumerable: true
   });
 
+  Object.defineProperty(this, 'groupBy', {
+    value: options.groupBy,
+    writable: false,
+    enumerable: true
+  })
+
   this.get = createQuery(resource, query, {
     default: options.default,
     sortField: sortField,
-    descending : descending
+    descending : descending,
+    groupBy: options.groupBy
   });
 }
 
@@ -66,6 +73,9 @@ function createQuery(resource, query, options) {
   if (options.default) {
     query = withDefault(query, options.default);
   }
+  if (options.groupBy) {
+    query = withGrouping(query, options.groupBy)
+  }
   return query;
 }
 
@@ -124,6 +134,37 @@ function queryBound(resource) {
   };
 }
 
+/**
+ * Transform the query such that the results are grouped by the
+ * given field
+ */
+function withGrouping(queryFn, groupField) {
+  return function() {
+    return Q.Promise(function(resolve, reject) {
+      queryFn().then(function(data) {
+        data = data || []
+        if (typeof data.length === 'undefined') {
+          data = [data]
+        }
+        var result = {}
+        result[groupField] = data.reduce(reduceToGroups, {})
+        resolve(result)
+      }, reject)
+    })
+  }
+
+  function reduceToGroups(acc, data) {
+    var groupName = data[groupField]
+    if (groupName) {
+      if (!acc[groupName]) {
+        acc[groupName] = []
+      }
+      acc[groupName].push(data)
+    }
+    return acc
+  }
+}
+
 function withDefault(queryFn, resultDefault) {
   return function() {
     return Q.Promise(function(resolve, reject) {
diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index fba1c18..5f99d59 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -135,25 +135,28 @@ function fetchTemplateData(meta, queries, id) {
           if (!result) {
             return cache;
           }
-          var resource = queries[i].resource;
-          var type = queries[i].as || queries[i].type;
+          var query = queries[i]
+          var resource = query.resource;
+          var type = query.as || query.type;
           var manyResult = isarray(result);
-          // Inform template of ID in generic field
-          if (manyResult) {
-            result = result.map(function(data) {
-              return assign({}, data, {id: resource.getID(data)})
-            });
-          } else {
-            result = assign({}, result, {id: resource.getID(result)});
-          }
+          var groupBy = query.groupBy
           // If we have a lot of results for a certain type,
           // we pluralize the key and yield an array of results
-          if (cache[type] || manyResult) {
+          if (cache[type] || manyResult || groupBy) {
             var plural = pluralize(type);
             delete cache[type];
             cache[plural] = [];
+            // Pluralize grouped field
+            if (query.groupBy) {
+              result = Object.keys(result).reduce(function(acc, key) {
+                acc[pluralize(key)] = result[key]
+                return acc
+              }, {})
+            }
             if (manyResult) {
               cache[plural] = cache[plural].concat(result);
+            } else if (groupBy) {
+              cache[plural] = result
             } else {
               cache[plural].push(result);
             }
@@ -162,7 +165,6 @@ function fetchTemplateData(meta, queries, id) {
           }
           return cache;
         }, {meta: meta});
-
         resolve(normalized);
       }
     }).fail(reject);
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 4be0afc..8a827ff 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -1,5 +1,5 @@
 var OKAdmin = function(){
-  
+
   // initialize our multi-image uploader with an element and a template
   $(".group.image-list").each(function(){
     var parent = this
@@ -79,7 +79,7 @@ var OKAdmin = function(){
   // make the region sortable with drag-and-drop
   $(".media-list ol, .image-list ol").sortable()
   $(".media-list ol, .image-list ol").disableSelection()
-  
+
   // populate a video field with info from our url parser
   var last_url
   $(".video .url").on("focus", function(){
@@ -201,7 +201,7 @@ var OKAdmin = function(){
       })
     })
   })
-  
+
   // delete individual records
   $("#delete_form").submit(function(e){
   	if (confirm("Are you sure you want to delete this record?")) {
@@ -213,9 +213,9 @@ var OKAdmin = function(){
   })
 
   // reorder items in categories
-  $(".resource-category").on("click", ".edit-btn", function(e) {
+  $(".resource-category:not(.grouped)").on("click", ".edit-btn", function(e) {
     e.preventDefault();
-    var $parent = $(e.delegateTarget);
+    var $parent = $(e.delegateTarget)
     var $editBtn = $parent.find(".edit-btn");
     var $cancelBtn = $parent.find(".cancel-btn");
     var $saveBtn = $parent.find(".save-btn");
@@ -245,7 +245,7 @@ var OKAdmin = function(){
   });
 
   // save new category order
-  $(".resource-category").on("submit", "form", function(e) {
+  $(".resource-category.root").on("submit", "form", function(e) {
     var $parent = $(e.delegateTarget);
     $parent.find(".resource-input").each(function(index) {
       var $input = $(this);
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index e9ad538..7af84b6 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -7,33 +7,66 @@
   {% assign name = pair[0] %}
   {% assign resource = pair[1] %}
 
-    <section class="resource-category {{name}}">
+    <section class="resource-category root
+        {% if resource.groupBy %} grouped {% endif %}
+        {{name}}">
       <form action="{{resource.type}}/__batch__/" method="POST">
         <header>
           <h2>{{name | capitalize}}</h2>
         </header>
-          <input type="hidden" name="_method" value="PUT">
-          <ol class="resource-list">
-          {% for data in resource.data %}
-            <li>
-              <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-              <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
-                  value='{{data | stringify | escape_once}}'>
-            </li>
+        <input type="hidden" name="_method" value="PUT">
+        {% if resource.groupBy %}
+          {% assign i = 0 %}
+          {% for pair in resource.data[resource.groupBy] %}
+          {% assign group = pair[0] %}
+          {% assign members = pair[1] %}
+            <section class="resource-category {{group}}">
+              <header>
+                <h2>{{group | capitalize}}</h2>
+              </header>
+              <ol class="resource-list">
+                {% for data in members %}
+                  <li>
+                    <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                    <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
+                        value='{{data | stringify | escape_once}}'>
+                  </li>
+                  {% assign i = i | plus: 1 %}
+                {% endfor %}
+              </ol>
+              <footer>
+                <nav>
+                  <a class="btn cancel-btn" href="#">cancel</a>
+                  <button type="submit"
+                      class="btn save-btn" href="#">save</button>
+                  <a class="btn edit-btn active" href="#">sort</a>
+                  <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+                </nav>
+              </footer>
+            </section>
           {% endfor %}
+        {% else %}
+          <ol class="resource-list">
+            {% for data in resource.data %}
+              <li>
+                <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
+                    value='{{data | stringify | escape_once}}'>
+              </li>
+            {% endfor %}
           </ol>
-        <footer>
-          <nav>
-            <a class="btn cancel-btn" href="#">cancel</a>
-            <button type="submit"
-                class="btn save-btn" href="#">save</button>
-            <a class="btn edit-btn active" href="#">sort</a>
-            <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
-          </nav>
-        </footer>
+          <footer>
+            <nav>
+              <a class="btn cancel-btn" href="#">cancel</a>
+              <button type="submit"
+                  class="btn save-btn" href="#">save</button>
+              <a class="btn edit-btn active" href="#">sort</a>
+              <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+            </nav>
+          </footer>
+        {% endif %}
       </form>
     </section>
-
   {% endfor %}
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From 7249dc10568091194a77990513fa2b77fdbd088a Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Jul 2015 17:31:40 -0400
Subject: Implement basic foreign key support

---
 app/index.js                                    |  23 ++++++
 app/node_modules/okadminview/index.js           | 100 ++++++++++++++++++------
 app/node_modules/okquery/index.js               |   1 +
 app/node_modules/okresource/index.js            |  66 ++++++++++++++++
 app/node_modules/okschema/index.js              |   4 +
 themes/okadmin/templates/partials/inputs.liquid |   2 +-
 6 files changed, 169 insertions(+), 27 deletions(-)

(limited to 'app/node_modules/okquery/index.js')

diff --git a/app/index.js b/app/index.js
index d514f10..2507dd2 100644
--- a/app/index.js
+++ b/app/index.js
@@ -78,6 +78,7 @@ function OKCMS(options) {
   });
   var resourceCache = this._resourceCache =
       this._createResources(resourceConfig, db, schemas);
+  this._resolveForeignKeys(resourceCache)
   var errorHandler = createErrorHandlerProducer(
       templateProvider, adminTemplateProvider, debug);
   // Create view instances from config
@@ -154,6 +155,21 @@ OKCMS.prototype._createResources = function(resourceConfig, db, schemaCache) {
   return ResourceCache(resources);
 };
 
+OKCMS.prototype._resolveForeignKeys = function(resourceCache) {
+  resourceCache.forEach(function(resource) {
+    Object.keys(resource.foreignKeys).forEach(function(field) {
+      var foreignKeyType = resource.foreignKeys[field]
+      var keyedResource = resourceCache.get(foreignKeyType)
+      if (!keyedResource) {
+        throw new Error(format(
+            "Foreign key field '%s' in '%s' resource references unknown" +
+            "resource of type '%s'", field, resource.type, foreignKeyType))
+      }
+      resource._linkForeignKey(field, resourceCache.get(foreignKeyType))
+    })
+  })
+}
+
 OKCMS.prototype._createViews = function(viewConfig, db,
     meta, resourceCache, templateProvider, errorHandler) {
   viewConfig = viewConfig || {};
@@ -279,6 +295,13 @@ ResourceCache.prototype.get = function(type, id) {
   }
 };
 
+ResourceCache.prototype.forEach = function(cb) {
+  cb = cb || function() {}
+  Object.keys(this._cache).forEach(function(key) {
+    cb(this._cache[key])
+  }.bind(this))
+}
+
 /**
  * Higher order function implementing customizable error handling
  */
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 273d541..06656dc 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -154,11 +154,12 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 404)(new Error('No such resource ' + type));
       } else {
-        var templateData = transformData(meta, resource, {});
-        view.renderResourceNew(req, res, assign(templateData, {
-          success: req.flash('success'),
-          errors: req.flash('errors'),
-        }));
+        fetchNewTemplateData(meta, resource, transformData).then(function(data) {
+          view.renderResourceNew(req, res, assign(data, {
+            success: req.flash('success'),
+            errors: req.flash('errors'),
+          }))
+        }).fail(error(req, res, 500))
       }
     });
 
@@ -280,11 +281,11 @@ function OKAdminView(options) {
 /**
  * Yields formatted template data for a single resource
  */
-function transformData(meta, resource, data) {
+function transformData(meta, spec, resource, data) {
   meta = meta || {};
   resource = resource || {};
   data = data || {};
-  var spec = Object.keys(resource.spec).reduce(function(cache, prop) {
+  var spec = Object.keys(spec).reduce(function(cache, prop) {
     var value = data[prop];
     var propSpec = cache[prop];
     // Decorate spec with actual resource values
@@ -294,7 +295,7 @@ function transformData(meta, resource, data) {
       propSpec.hidden = true;
     }
     return cache;
-  }, resource.spec);
+  }, spec);
   return {
     meta: meta,
     resource: {
@@ -340,47 +341,94 @@ function fetchIndexTemplateData(meta, queries, dashboardConfig) {
     Q.all(queries.map(function(query) {
       return query.get();
     })).then(function(results) {
-      var resources = results.reduce(function(cache, result, i) {
-        if (!result)
-          return cache;
+      var templateData = results.reduce(function(acc, result, i) {
         var resource = queries[i].resource;
         // We want the raw object spec
         var spec = resource.spec;
         var dashConf = resourceConfig[resource.type] || {}
         var groupBy = dashConf.groupBy
         var key = pluralize(resource.type)
-        cache[key] = {
+        acc[key] = {
           type: resource.type,
           spec: spec,
           data: result,
           groupBy: groupBy
         }
-        return cache;
-      }, {});
-
+        return acc
+      }, {})
       resolve({
         meta: meta,
-        resources: resources
-      });
-    }).fail(reject);
+        resources: templateData
+      })
+    }).fail(reject)
   });
 }
 
+function fetchNewTemplateData(meta, resource, transformFn) {
+  return Q.promise(function(resolve, reject) {
+    if (!resource.hasForeignKey) {
+      done({spec: resource.spec, resource: resource})
+    } else {
+      fetchForeignKeyOptions(resource).then(done).fail(reject)
+    }
+
+    function done(results) {
+      resolve(transformFn(meta, results.spec, results.resource, {}))
+    }
+  })
+}
+
 /**
  * Annotate template data with schema info
  */
-function fetchResourceTemplateData(meta, query, fn) {
-  fn = fn || function(m, r, d) { return {meta: m, resource: d}; };
+function fetchResourceTemplateData(meta, query, transformFn) {
   return Q.promise(function(resolve, reject) {
     query.get().then(function(data) {
-      if (!data) {
-        reject(new Error('No resource data'));
+      if (!data)
+        return reject(new Error('No resource data'))
+
+      var resource = query.resource
+
+      if (resource.hasForeignKey) {
+        fetchForeignKeyOptions(resource).then(done).fail(reject)
       } else {
-        var resource = query.resource;
-        resolve(fn(meta, resource, data));
+        done({spec: resource.spec, resource: resource})
       }
-    }).fail(reject);
-  });
+
+      function done(results) {
+        resolve(transformFn(meta, results.spec, results.resource, data))
+      }
+    }).fail(reject)
+  })
+}
+
+function fetchForeignKeyOptions(resource) {
+  var promises = Object.keys(resource.foreignKeys)
+      .map(fetchOptionsForKey)
+  var spec = resource.spec
+
+  return Q.all(promises).then(done)
+
+  function done() {
+    return Q.promise(function(resolve, reject) {
+      resolve({spec: spec, resource: resource})
+    })
+  }
+
+  function fetchOptionsForKey(field) {
+    var relatedResourceType = resource.foreignKeys[field]
+    return resource.related(relatedResourceType).then(fillOptions)
+
+    function fillOptions(results) {
+      return Q.promise(function(resolve, reject) {
+        spec[field].options = results.map(function(result) {
+          return result.id
+        })
+        resolve()
+      })
+    }
+  }
 }
 
+
 module.exports = OKAdminView;
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 09d867d..d4cb905 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -23,6 +23,7 @@ function OKQuery(options) {
 
   // Queries are ordered by index by default
   var sortField = options.sortBy || '__index';
+  // TODO Make descending by default
   var descending = options.descending || false;
 
   Object.defineProperty(this, 'resource', {
diff --git a/app/node_modules/okresource/index.js b/app/node_modules/okresource/index.js
index c3f9adb..c1f2509 100644
--- a/app/node_modules/okresource/index.js
+++ b/app/node_modules/okresource/index.js
@@ -1,3 +1,4 @@
+var format = require('util').format
 var assign = require('object-assign');
 var cloneDeep = require('lodash.clonedeep');
 var Q = require('q');
@@ -22,10 +23,36 @@ function OKResource(options) {
   var spec = schema.spec;
 
   var type = options.type;
+  var hasForeignKey = false
   this._db = options.db;
   this._schema = schema;
 
+  var foreignKeys = Object.keys(spec).reduce(function(acc, field) {
+    var fieldSpec = spec[field]
+    if (fieldSpec.type === 'foreign-key') {
+      hasForeignKey = true
+      acc[field] = fieldSpec.key
+    }
+    return acc
+  }, {})
+
+  // Will store references to other resources referenced via foreign keys
+  this._foreignKeyedResources = {}
+
   // Define properties which are part of the API
+  
+  // Should be treated as read-only
+  Object.defineProperty(this, 'foreignKeys', {
+    get: function() {
+      return foreignKeys
+    }
+  })
+
+  Object.defineProperty(this, 'hasForeignKey', {
+    get: function() {
+      return hasForeignKey
+    }
+  })
 
   Object.defineProperty(this, 'spec', {
     get: function() {
@@ -49,6 +76,30 @@ function OKResource(options) {
   });
 }
 
+OKResource.prototype._linkForeignKey = function(field, resource) {
+  this._foreignKeyedResources[field] = resource
+}
+
+/**
+ * Fetch all related resources for the given field
+ */
+OKResource.prototype.related = function(field) {
+  var resource = this._foreignKeyedResources[field]
+  return Q.promise(function(resolve, reject) {
+    if (!resource) {
+      return error(reject, new Error(format(
+          "No related resource for field '%s'", field)))
+    }
+    resource.all().then(resolve).fail(reject)
+  })
+
+  function error(reject, err) {
+    setTimeout(function() {
+      reject(err)
+    }, 0)
+  }
+}
+
 /**
  * Throws an error if data does not conform to schema
  */
@@ -180,6 +231,9 @@ OKResource.prototype.instance = function(options) {
   });
 };
 
+/**
+ * TODO This class is such bullshit. Refactor out
+ */
 function OKResourceInstance(resource, options) {
   if (!(this instanceof OKResourceInstance)) return new OKResourceInstance(options);
   // Only support static data instances for now
@@ -279,6 +333,18 @@ function OKResourceInstance(resource, options) {
     resource.assertValid(data);
   };
 
+  Object.defineProperty(this, 'foreignKeys', {
+    get: function() {
+      return []
+    }
+  })
+
+  Object.defineProperty(this, 'hasForeignKey', {
+    get: function() {
+      return false
+    }
+  })
+
   Object.defineProperty(this, 'parent', {
     value: resource,
     writable: false,
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 89b59cc..330ad6b 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -73,6 +73,10 @@ var types = {
   'flag': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'foreign-key': {
+    parent: 'enum',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 9c1a26b..c6efc68 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -17,7 +17,7 @@
       <input
         type="number"
         name="{{name}}" value="{{spec.value}}">
-    {% elsif type == 'enum' %}
+    {% elsif type == 'enum' or type == 'foreign-key' %}
       <select
         name="{{name}}">
         {% for option in spec.options %}
-- 
cgit v1.2.3-70-g09d2