From 0c15bca2807254a2bc322357bb6a00ce00272e06 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Sun, 18 Dec 2016 23:44:22 -0700 Subject: [PATCH] Update readme after URL changes (rancher/rancher#6470) --- app/components/new-catalog/component.js | 4 +++- app/login/route.js | 1 - app/templates/ldap-config.hbs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/components/new-catalog/component.js b/app/components/new-catalog/component.js index c70e2d8f4..8cb544a21 100644 --- a/app/components/new-catalog/component.js +++ b/app/components/new-catalog/component.js @@ -88,7 +88,7 @@ export default Ember.Component.extend(NewOrEdit, { this.set('readmeContent', response); }); } - }.observes('selectedTemplateModel.links.readme'), + }, sortedVersions: function() { let out = this.get('versionsArray').sort((a,b) => { @@ -155,10 +155,12 @@ export default Ember.Component.extend(NewOrEdit, { this.set('selectedTemplateModel', response); this.set('previewTab', Object.keys(response.get('files')||[])[0]); + this.updateReadme(); this.set('loading', false); }, ( /*error*/ ) => {}); } else { this.set('selectedTemplateModel', null); + this.updateReadme(); this.set('readmeContent', null); } }.observes('selectedTemplateUrl','templateResource.defaultVersion'), diff --git a/app/login/route.js b/app/login/route.js index 3effb4b77..d45433c76 100644 --- a/app/login/route.js +++ b/app/login/route.js @@ -1,5 +1,4 @@ import Ember from 'ember'; -import C from 'ui/utils/constants'; export default Ember.Route.extend({ access: Ember.inject.service(), diff --git a/app/templates/ldap-config.hbs b/app/templates/ldap-config.hbs index 2c1c34cb9..0d5a39195 100644 --- a/app/templates/ldap-config.hbs +++ b/app/templates/ldap-config.hbs @@ -136,7 +136,7 @@

{{t 'ldap.accessConfig.defaultDomain.helpText'}}

- + {{input type="text" value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}}