Changeset 490 for Dev/trunk/src/client/qed-client/model/classes

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.

Location:

Dev/trunk/src/client/qed-client/model/classes

Files:

• _Class.js (modified) (2 diffs)
• _View.js (modified) (3 diffs)
• responses.js (modified) (4 diffs)
• surveys.js (modified) (1 diff)

Dev/trunk/src/client/qed-client/model/classes/_Class.js

@@ -27 +27 @@
         },
         load: function(id) {
-            return this._store.get(id).then(lang.hitch(this,'_doDeserialize'));
+            return this._store.get(id)
+            .then(lang.hitch(this,'_doDeserialize'),
+                  lang.hitch(this,'_deserializeError'));
         },
         save: function(obj) {
-            return this._store.put(this._doSerialize(obj));
+            return this._store.put(this._doSerialize(obj))
+            .otherwise(lang.hitch(this,'_deserializeError'));
         },
         remove: function(objOrId,rev) {
@@ -40 +43 @@
                 rev = this.getRev(objOrId);
             }
-            return this._store.remove(id,{headers:{'If-Match':'"'+rev+'"'}});
+            return this._store.remove(id,{headers:{'If-Match':'"'+rev+'"'}})
+            .otherwise(lang.hitch(this,'_deserializeError'));
         },
         getRev: function(obj) {
             return obj._rev;
+        },
+        getName: function() {
+            return this._type;
+        },
+        getObjectPath: function(idOrObj) {
+            return '/'+this._collection+'/'+(typeof idOrObj === "string" ?
+                                             idOrObj :
+                                             this.getId(idOrObj));
         }
     });

Dev/trunk/src/client/qed-client/model/classes/_View.js

@@ -1 +1 @@
 define([
     "../../store/JsonRest",
+    "dojo/Deferred",
     "dojo/_base/declare",
+    "dojo/_base/json",
     "dojo/_base/lang",
     "dojo/store/util/QueryResults"
-], function(JsonRest, declare, lang, queryResults) {
+], function(JsonRest, Deferred, declare, json, lang, queryResults) {
 
     var _View = declare([],{
@@ -18 +20 @@
             });
         },
+        _deserializeError: function(err) {
+            return new Deferred().reject(json.fromJson(err.responseText));
+        },
         _doDeserialize: function(obj) {
             obj = lang.clone(obj);
@@ -30 +35 @@
         getId: function(obj) {
             return obj._id;
+        },
+        getCollectionPath: function() {
+            return '/'+this._collection;
         }
     });

Dev/trunk/src/client/qed-client/model/classes/responses.js

@@ -43 +43 @@
                 handleAs: 'json',
                 contentType: false
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         postWithSecret: function(response,secret) {
@@ -55 +54 @@
                 contentType: 'application/json',
                 rawBody: body
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         putWithSecret: function(response,secret) {
@@ -67 +65 @@
                 contentType: 'application/json',
                 rawBody: body
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         removeWithSecret: function(response,secret) {
@@ -85 +82 @@
                 contentType: 'application/json',
                 rawBody: body
-            });
+            }).otherwise(lang.hitch(this,'_deserializeError'));
         }
     });

Dev/trunk/src/client/qed-client/model/classes/surveys.js

@@ -26 +26 @@
                 obj.publicationDate = stamp.toISOString(obj.publicationDate);
             }
+        },
+        getPreviewPath: function(idOrObj) {
+            return '/previewSurvey/'+(typeof idOrObj === "string"?
+                                      idOrObj :
+                                      this.getId(idOrObj));
         }
     });