Changeset 414 for Dev/branches/rest-dojo-ui/client/config

Timestamp:

11/24/12 18:13:18 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Small issues for db name, widgets, startup.

Don't start application when database is not configured correctly.
Refactored edit widgets to use DefaultEdit?.
Fixed bug in getItems of Lists.
Renamed database to 'qed'.

Location:

Dev/branches/rest-dojo-ui/client/config

Files:

• config.sh (modified) (1 diff)
• db.js (modified) (1 diff)
• docs.js (modified) (4 diffs)

Dev/branches/rest-dojo-ui/client/config/config.sh

@@ -1 +1 @@
 #!/bin/sh
-node ../dojo/dojo.js load=config/db
+nodejs ../dojo/dojo.js load=config/db

Dev/branches/rest-dojo-ui/client/config/db.js

@@ -91 +91 @@
             });
         },function(){
-            console.log("Checking database 'rft'");
-            return req('get','rft')
-            .then(function(){
-                console.log("Database 'rft' found.");
-            },function(){
-                console.log("Creating database 'rft'");
-                return req('put','/rft');
+            console.log("Checking database 'qed'");
+            return req('get','qed')
+            .then(function(res){
+                if (res.error) {
+                    console.log("Creating database 'qed'");
+                    return req('put','/qed');
+                } else {
+                    console.log("Database 'qed' found.");
+                }
+            },function(res){
+                console.log("Creating database 'qed'");
+                return req('put','/qed');
             });
         },function(){

Dev/branches/rest-dojo-ui/client/config/docs.js

@@ -1 +1 @@
 define([],function(){
     return {
-        "_users/rft_admin": {
+        "_users/qed_admin": {
             __configAction: "ignore",
-            _id: "org.couchdb.user:rft_admin",
-            name: "rft_admin",
+            _id: "org.couchdb.user:qed_admin",
+            name: "qed_admin",
             password: "Welkom01",
-            roles: [ "rft_admin" ],
+            roles: [ "qed_admin" ],
             type: "user"
         },
-        "rft/_security": {
+        "qed/_security": {
             __configAction: "ignore",
             admins: {
                 names: [],
-                roles: ["rft_admin"]
+                roles: ["qed_admin"]
             },
             readers: {
                 names: [],
-                roles: ["rft_user"]
+                roles: ["qed_user"]
             }
         },
-        "rft/_design/default": {
+        "qed/_design/default": {
             __configAction: "replace",
             _id: "_design/default",
@@ -36 +36 @@
             }
         },
-        "rft/_design/questions": {
+        "qed/_design/questions": {
             __configAction: "replace",
             _id: "_design/questions",
@@ -75 +75 @@
                         if( doc.type !== 'Question' ){ return; }
                         emit(doc.topic);
-                    }
+                    },
+                    reduce: function(key, values, rereduce) { return null; }
                 },
                 published_topics: {
@@ -81 +82 @@
                         if ( doc.type !== 'Question' || !doc.publicationDate ) { return; }
                         emit(doc.topic);
-                    }
+                    },
+                    reduce: function(key, values, rereduce) { return null; }
                 }
             }
         },
-        "rft/_design/surveys": {
+        "qed/_design/surveys": {
             __configAction: "replace",
             _id: "_design/surveys",