Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

1 files changed, 10 insertions, 25 deletions

diff --git a/app/index.js b/app/index.js
index 01ea33b..d487bd7 100644
--- a/app/index.js
+++ b/app/index.js
@@ -38,33 +38,18 @@ function OKCMS(options) {
     path.join(__dirname, '../themes/okadmin/templates');
   var debug = options.debug || false;
 
-  // Set metadata defaults
-  // TODO Abstract this out somewhere else
-  var meta = {
-    type: 'meta',
-    get: function() {
-      return Q.promise(function(resolve, reject) {
-        db.getMeta().then(function(metadata) {
-          resolve(assign({}, {
-            static: ''
-          }, metadata));
-        }).fail(reject);
-      });
-    }
+  var metaUser = options.meta || {};
+  var metaDefault = {
+    project: 'OKCMS'
   };
 
-  var adminMeta ={
-    type: 'meta',
-    get: function() {
-      return Q.promise(function(resolve, reject) {
-        db.getMeta().then(function(metadata) {
-          resolve(assign({}, {
-            static: withoutTrailingSlash(adminPath)
-          }, metadata));
-        }).fail(reject);
-      });
-    }
-  };
+  var meta = assign({
+    static: ''
+  }, metaDefault, metaUser);
+
+  var adminMeta = assign({
+      static: withoutTrailingSlash(adminPath)
+  }, metaDefault, metaUser);
 
   var schemaConfig = options.schemas || {};
   var resourceConfig = options.resources || [];