Changeset 490 for Dev/trunk/src/client/qed-client/pages/surveys.js

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

File:

• Dev/trunk/src/client/qed-client/pages/surveys.js (modified) (6 diffs)

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

@@ -1 +1 @@
 define([
-    "../app/Content",
     "../app/Page",
     "../app/Router",
+    "../model/classes/surveyRuns",
     "../model/classes/surveys",
-    "../model/classes/surveyRuns",
     "../widgets/LineWithActionsWidget",
     "dojo/_base/array",
@@ -11 +10 @@
     "dojo/when",
     "dojo/text!./templates/surveys.html"
-], function(Content, Page, Router, surveys, surveyRuns, LineWithActionsWidget, array, declare, lang, when, template) {
+], function(Page, Router, surveyRuns, surveys, LineWithActionsWidget, array, declare, lang, when, template) {
     return declare([Page],{
         templateString: template,
@@ -20 +19 @@
         },
         _onNewSurvey: function(){
-            Router.go('/survey/new');
+            Router.go(surveys.getObjectPath('new'));
         },
         _onPublishSurvey:function(survey){
@@ -29 +28 @@
                 self.refreshDrafts();
                 self.refreshPublished();
-            },function(err){
-                Content.notify(err,'error');
-            });
+            },lang.hitch(this,function(err){
+                this.notify(err.error,'error');
+            }));
         },
         _onDeleteSurvey:function(survey){
@@ -38 +37 @@
             .then(function(){
                 self.refreshDrafts();
-            },function(err){
-                Content.notify(err,'error');
-            });
+            },lang.hitch(this,function(err){
+                this.notify(err.error,'error');
+            }));
         },
         _onEditSurvey:function(survey){
-            Router.go('/survey/'+survey._id);
+            Router.go(surveys.getObjectPath(survey));
         },
         _onPreviewSurvey:function(survey){
-            Router.go('/previewSurvey/'+survey._id);
+            Router.go(surveys.getPreviewPath(survey));
         },
         _onRunSurvey:function(survey){
@@ -54 +53 @@
             .then(lang.hitch(this,function(surveyRun){
                 this._onRunDetails(surveyRun);
-            }),function(err){
-                Content.notify(err);
-            });
+            }),lang.hitch(this,function(err){
+                this.notify(err.error,'error');
+            }));
         },
         _onRunDetails: function(surveyRun) {
-            Router.go('/surveyRun/'+surveyRun._id);
+            Router.go(surveyRuns.getObjectPath(surveyRun));
         },
         refresh: function() {