Changeset 497 for Dev

Timestamp:

03/10/14 01:33:18 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Better names for db backup and sync scripts.
• Added SurveyRun? deletion in UI and prevent on server when a run has replies.

Location:

Dev/trunk

Files:

• backup.sh (deleted)
• db-backup-cloud-to-dated-local.sh (added)
• db-pull-cloud-to-local.sh (added)
• db-push-local-to-cloud.sh (added)
• deploy.sh (modified) (1 diff)
• env.sh (added)
• src/client/qed-client/pages/surveys.js (modified) (2 diffs)
• src/server/app.js (modified) (1 diff)

Dev/trunk/deploy.sh

@@ -1 +1 @@
 #!/bin/sh
 
-DEPLOYURL=git@heroku.com:quod-erat.git
-DEPLOYDIR=quod-erat.git
+. ./env.sh
+
 RELBUILDDIR=../build
 

Dev/trunk/src/client/qed-client/pages/surveys.js

@@ -59 +59 @@
         _onRunDetails: function(surveyRun) {
             Router.go(surveyRuns.getObjectPath(surveyRun));
+        },
+        _onRunDelete: function(surveyRun) {
+            surveyRuns.remove(surveyRun)
+            .then(lang.hitch(this,function(){
+                this.notify("SurveyRun successfully deleted.");
+                this.refreshRuns();
+            }),lang.hitch(this,function(err){
+                this.notify(err.error,'error');
+            }));
         },
         refresh: function() {
@@ -145 +154 @@
                                 label: 'Details',
                                 tooltip: 'Show details for this run',
-                                icon: 'Details'
+                                icon: 'Edit'
+                            }
+                        },{
+                            callback: lang.hitch(this,'_onRunDelete',surveyRun),
+                            properties: {
+                                label: 'Delete',
+                                tooltip: 'Delete this run',
+                                icon: 'Delete'
                             }
                         }]

Dev/trunk/src/server/app.js

@@ -622 +622 @@
         ensureAuthenticated,
         ensureMIME(JSON_MIME),
-        makeDocDel_id('SurveyRun'));
+        function(req,res) {
+            var id = req.params.id;
+            var doc = req.body;
+            var rev = etags.parse(req.header('If-Match'))[0] || (doc && doc._rev);
+            getResponsesBySurveyRunId(id)
+            .handle({
+                200: function(responses) {
+                    if ( responses.length > 0 ) {
+                        return new HTTPResult(403,{error:"Cannot delete run that has responses."});
+                    } else {
+                        return deleteDocument(id,rev);
+                    }
+                }
+            }).handle(res.send.bind(res));
+        });
     app.get('/api/surveyRuns/:id/responses',
         ensureAuthenticated,