Merge lp:~stephen-stewart/snapweb/webdm-uninstallable into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

allow certain ids to be isInstallable false

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~stephen-stewart/webdm/webdm-uninstallable into lp:webdm failed. Below is the output from the failed tests.

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
mktemp: failed to create directory via template ‘~/tmp/tmp.XXXXXXXXXX’: No such file or directory
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
mkdir: cannot create directory ‘/src’: Permission denied

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:webdm failed due to conflicts:

text conflict in www/src/js/config.js

[lp:~stephen-stewart/snapweb/webdm-uninstallable]

134. By Stephen Stewart on 2015-05-07

merge trunk

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'www/src/js/config.js'
--- www/src/js/config.js	2015-05-07 21:32:14 +0000
+++ www/src/js/config.js	2015-05-07 21:42:33 +0000
@@ -5,6 +5,10 @@
     'webdm',
     'ubuntu-core'
   ],
+  NON_INSTALLABLE_IDS: [
+    'webdm',
+    'ubuntu-core.ubuntu'
+  ],
   NON_INSTALLABLE_TYPES: [
     'oem'
   ],

=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-05-07 20:00:36 +0000
+++ www/src/js/models/snap.js	2015-05-07 21:42:33 +0000
@@ -121,6 +121,7 @@
   parse: function(response) {
 
     var type = response.type;
+    var id  = response.id;
 
     if (response.hasOwnProperty('icon') && !response.icon.length) {
       response.icon = this.defaults.icon;
@@ -136,6 +137,12 @@
       }
     }
 
+    if (id) {
+      if (_.contains(CONF.NON_INSTALLABLE_IDS, id)) {
+        response.isInstallable = false;
+      }
+    }
+
     return response;
   },