Merge pull request #124 from vincent99/master

Bug fixes
rancher · Apr 16, 2015 · c681113 · c681113
2 parents 609eaea + 856b280
commit c681113
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 26 deletions.
diff --git a/app/components/loadbalancer-pod/template.hbs b/app/components/loadbalancer-pod/template.hbs
@@ -21,11 +21,11 @@
 </div>
 
 <div class="pod-info clearfix">
-  <div class="pod-info-line">
-    {{#each host in model.hosts}}
-      <div class="pod-info-item"><i class="ss-link"></i> {{host.ipAddresses.firstObject.address}}</div>
-    {{/each}}
-  </div>
+  {{#each host in model.hosts itemController="host"}}
+    <div class="pod-info-line clip">
+      <div class="pod-info-item"><i class="ss-link"></i> {{host.displayName}}: {{host.displayIp}}</div>
+    </div>
+  {{/each}}
 </div>
 
 <div class="clearfix no-resource-action-hover">

diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
@@ -33,10 +33,6 @@
         {{#link-to "apikeys" role="menuitem" tabindex="-1"}}API &amp; Keys{{/link-to}}
       </li>
 
-      <li role="presentation">
-        {{#link-to "registries" role="menuitem" tabindex="-1"}}Registries{{/link-to}}
-      </li>
-
       {{#if app.isAuthenticationAdmin}}
         <li role="presentation">
           {{#link-to "settings.auth" role="menuitem" tabindex="-1"}}Access Control{{/link-to}}

diff --git a/app/loadbalancer/controller.js b/app/loadbalancer/controller.js
@@ -32,19 +32,6 @@ var LoadBalancerController = Cattle.TransitioningResourceController.extend({
       sortProperties: ['ipAddress', 'instance.name', 'instance.id', 'instanceId']
     });
   }.property('instances.[]','loadBalancerTargets.@each.{instanceId,ipAddress}'),
-
-  hostsBlurbs: function() {
-    var ips = [];
-    (this.get('hosts')||[]).forEach((host) => {
-      var ip = host.get('ipAddresses.firstObject.address');
-      if ( ip )
-      {
-        ips.push(ip);
-      }
-    });
-
-    return ips;
-  }.property('hosts.[]').volatile(),
 });
 
 LoadBalancerController.reopenClass({

diff --git a/app/loadbalancers/new/route.js b/app/loadbalancers/new/route.js
@@ -35,6 +35,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
           type: 'loadBalancerAppCookieStickinessPolicy',
           mode: 'path_parameters',
           requestLearn: true,
+          prefix: false,
           timeout: 3600000,
         }),
         lbCookie: store.createRecord({

diff --git a/app/loadbalancers/route.js b/app/loadbalancers/route.js
@@ -2,6 +2,9 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model: function() {
-    return this.get('store').findAllUnremoved('loadbalancer');
+    var store = this.get('store');
+    return store.findAllUnremoved('host').then(() => {
+      return store.findAllUnremoved('loadbalancer');
+    });
   },
 });
diff --git a/app/mixins/edit-container.js b/app/mixins/edit-container.js
@@ -659,11 +659,11 @@ export default Ember.Mixin.create(Cattle.NewOrEditMixin, {
     var out = ShellQuote.parse(this.get('strEntryPoint').trim()||'');
     if ( out.length )
     {
-      this.set('entryPoint', out);
+      this.set('instance.entryPoint', out);
     }
     else
     {
-      this.set('entryPoint', null);
+      this.set('instance.entryPoint', null);
     }
   }.observes('strEntryPoint'),
 

diff --git a/app/templates/container/new-security.hbs b/app/templates/container/new-security.hbs
@@ -33,7 +33,7 @@
   <div class="col-sm-12 col-md-3">
     {{input id="cpuSet" type="text" value=instance.cpuSet classNames="form-control" placeholder="e.g. 0,3; Default: All"}}
   </div>
-  <div class="col-sm-12 col-md-2 form-label" style="text-align: left">
+  <div class="col-sm-12 col-md-2 form-label">
     <label for="cpuShares" class="form-control-static">Shares</label>
   </div>
   <div class="col-sm-12 col-md-3">

diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "ui",
+  "version": "0.16.2",
   "private": true,
   "directories": {
     "doc": "doc",