From eb779beb83ed6e8d000fd0453c9ed5c404327ae4 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 16 Apr 2015 02:11:55 -0400
Subject: Take metadata from config and make synchronous

---
 app/index.js | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

(limited to 'app/index.js')

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 || [];
-- 
cgit v1.2.3-70-g09d2