Merge pull request rancher#953 from vincent99/master

Bump lacsso
Cerfoglg · Dec 21, 2016 · e759ced · e759ced
2 parents 22d71fc + 39d2fb3
commit e759ced
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/app/container/controller.js b/app/container/controller.js
@@ -1,15 +1,9 @@
 import Ember from 'ember';
 
-const {computed, get} = Ember;
-
 export default Ember.Controller.extend({
   actions: {
     changeContainer(container) {
       this.transitionToRoute('container', container.get('id'));
     }
   },
-
-  stackName: computed('model.labels', function() {
-    return get(this, 'model.labels')['io.rancher.stack.name'];
-  }),
 });
diff --git a/app/container/template.hbs b/app/container/template.hbs
@@ -28,7 +28,7 @@
       {{#if model.primaryService}}
           <label class="block">{{t 'containersPage.containerPage.infoMultiStats.stack'}}</label>
 
-          <div>{{#link-to "stack" model.primaryService.stackId}}{{stackName}}{{/link-to}}/{{#link-to "service" model.primaryService.stackId model.primaryService.id}}{{model.primaryService.displayName}}{{/link-to}}</div>
+          <div>{{#link-to "stack" model.primaryService.stackId}}{{model.primaryService.stack.displayName}}{{/link-to}}/{{#link-to "service" model.primaryService.stackId model.primaryService.id}}{{model.primaryService.displayName}}{{/link-to}}</div>
         <hr>
       {{/if}}
 

diff --git a/app/services/prefs.js b/app/services/prefs.js
@@ -56,7 +56,7 @@ export default Ember.Service.extend({
     }
 
     let neu = JSON.stringify(value);
-    if ( obj.get('value') !== neu ) {
+    if ( !obj.get('id') || obj.get('value') !== neu ) {
       obj.set('value', neu);
       obj.save().then(() => {
         Ember.run(() => {

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -54,8 +54,10 @@ module.exports = function(defaults) {
 
         // These get version added to the query string so JS doesn't have to know the fingerprint
         'assets/intl',
-        'ui-light.css', 'ui-dark.css', 'ui-light.rtl.css', 'ui-dark.rtl.css', 'ui.css',
-        'vendor.css','vendor.rtl.css',
+        'ui-light.css', 'ui-light.rtl.css',
+        'ui-dark.css',  'ui-dark.rtl.css',
+        'ui.css',       'ui.rtl.css',
+        'vendor.css',   'vendor.rtl.css',
       ],
       extensions: (appConfig.fingerprint === 'no' ? [] : ['js', 'css', 'png', 'jpg', 'gif', 'svg', 'map', 'woff', 'woff2', 'ttf']),
     },

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "forever-agent": "^0.6.1",
     "glob": "^5.0.3",
     "http-proxy": "^1.11.1",
-    "lacsso": "0.0.36",
+    "lacsso": "0.0.37",
     "liquid-fire": "0.26.4",
     "loader.js": "^4.0.10",
     "shell-quote": "^1.4.3",