Merge lp:~stephen-stewart/snapweb/json-error-responses into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

handle 500's, use the response to set the model state

[Sergio Schvezov (sergiusens)]

There are some x-cross merges here but arg, let's do this...

review: Approve

=== modified file 'snappy/converge.go'
=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-05-05 11:20:39 +0000
+++ www/src/js/models/snap.js	2015-05-06 15:25:29 +0000
@@ -2,7 +2,9 @@
 
 var _ = require('lodash');
 var Backbone = require('backbone');
+var Radio = require('backbone.radio');
 var CONF = require('../config.js');
+var chan = Radio.channel('root');
 
 /** Snap Model
  *
@@ -29,16 +31,13 @@
 
   initialize: function() {
 
-    this.on('error', function(model, response, opts) {
-      var httpStatus = opts.xhr.status;
-    });
-
     this.on('add sync', function(model, response, opts) {
       var status = model.get('status') || opts.xhr.status;
 
-      if (status === 202 ||
-          status === CONF.INSTALL_STATE.INSTALLING ||
-          status === CONF.INSTALL_STATE.UNINSTALLING) {
+      if (
+        status === CONF.INSTALL_STATE.INSTALLING ||
+        status === CONF.INSTALL_STATE.UNINSTALLING
+      ) {
         _.delay(function(model) {
           model.fetch();
         }, CONF.INSTALL_POLL_WAIT, model);
@@ -47,16 +46,19 @@
     });
 
     this.on('error', function(model, response, opts) {
-      var status = model.get('status') || opts.xhr.status;
-      model.set({
-        'status': model.previous('status'),
-        'message': response.statusText
-      });
+      this.set(this.parse(response.responseJSON));
+      chan.command('alert:error', model);
     });
 
+    this.on('change:message', this.onMessageChange);
+
     this.on('add change:status', this.handleStatusChange);
   },
 
+  onMessageChange: function(model) {
+    console.log('message:', model.get('message'));
+  },
+
   handleStatusChange: function(model) {
     this.setInstallActionString(model);
     this.setInstallHTMLClass(model);

=== modified file 'www/src/js/views/snap-layout.js'
--- www/src/js/views/snap-layout.js	2015-05-06 09:46:30 +0000
+++ www/src/js/views/snap-layout.js	2015-05-06 15:25:29 +0000
@@ -2,14 +2,12 @@
 var _ = require('lodash');
 var Backbone = require('backbone');
 var Marionette = require('backbone.marionette');
-var Radio = require('backbone.radio');
 var SnapMenuView = require('./snap-menu.js');
 var SnapDetailView = require('./snap-detail.js');
 var SnapReviewsView = require('./snap-reviews.js');
 var SnapSettingsView = require('./snap-settings.js');
 var template = require('../templates/snap-layout.hbs');
 var CONF = require('../config.js');
-var chan = Radio.channel('root');
 
 module.exports = Marionette.LayoutView.extend({
 
@@ -21,9 +19,6 @@
       this.model, 'change:status', this.onModelStatusChange
     );
     this.listenTo(
-      this.model, 'change:message', this.onModelError
-    );
-    this.listenTo(
       this.model, 'change:progress', this.onProgressChange
     );
   },
@@ -42,10 +37,6 @@
     }
   },
 
-  onModelError: function(model) {
-    chan.command('alert:error', model);
-  },
-
   onModelHTMLClassChange: function(model) {
     var installer = this.ui.installer;
     installer.removeClass(model.previous('installHTMLClass'))