rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update readme after URL changes (rancher/rancher#6470)

This commit is contained in:
Vincent Fiduccia 2016-12-18 23:44:22 -07:00
parent 80ef951d9a
commit 0c15bca280
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/new-catalog/component.js
View File

@ -88,7 +88,7 @@ export default Ember.Component.extend(NewOrEdit, {
this.set('readmeContent', response); this.set('readmeContent', response);
}); });
} }
}.observes('selectedTemplateModel.links.readme'), },
sortedVersions: function() { sortedVersions: function() {
let out = this.get('versionsArray').sort((a,b) => { let out = this.get('versionsArray').sort((a,b) => {
@ -155,10 +155,12 @@ export default Ember.Component.extend(NewOrEdit, {
this.set('selectedTemplateModel', response); this.set('selectedTemplateModel', response);
this.set('previewTab', Object.keys(response.get('files')||[])[0]); this.set('previewTab', Object.keys(response.get('files')||[])[0]);
this.updateReadme();
this.set('loading', false); this.set('loading', false);
}, ( /*error*/ ) => {}); }, ( /*error*/ ) => {});
} else { } else {
this.set('selectedTemplateModel', null); this.set('selectedTemplateModel', null);
this.updateReadme();
this.set('readmeContent', null); this.set('readmeContent', null);
} }
}.observes('selectedTemplateUrl','templateResource.defaultVersion'), }.observes('selectedTemplateUrl','templateResource.defaultVersion'),

1
app/login/route.js
View File

@ -1,5 +1,4 @@
import Ember from 'ember'; import Ember from 'ember';
import C from 'ui/utils/constants';
export default Ember.Route.extend({ export default Ember.Route.extend({
access: Ember.inject.service(), access: Ember.inject.service(),

2
app/templates/ldap-config.hbs
View File

@ -136,7 +136,7 @@
<div class="col-md-6"> <div class="col-md-6">
<p class="help-block">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p> <p class="help-block">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p>
<div class="form-group"> <div class="form-group">
<label>{{t 'ldap.accessConfig.defaultDomain.labelText'}}*</label> <label>{{t 'ldap.accessConfig.defaultDomain.labelText'}}</label>
{{input type="text" value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}} {{input type="text" value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}}
</div> </div>
</div> </div>