mirror of https://github.com/rancher/ui.git
Fix refresh with no project (#627)
This commit is contained in:
parent
c365d8da2a
commit
080ba9ed9f
|
|
@ -226,9 +226,11 @@ export default Ember.Route.extend(Subscribe, {
|
||||||
|
|
||||||
refreshKubernetes() {
|
refreshKubernetes() {
|
||||||
var model = this.get('controller.model');
|
var model = this.get('controller.model');
|
||||||
this.loadKubernetes(model.get('project')).then((hash) => {
|
if ( model.get('project') ) {
|
||||||
model.setProperties(hash);
|
this.loadKubernetes(model.get('project')).then((hash) => {
|
||||||
});
|
model.setProperties(hash);
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
switchNamespace(namespaceId) {
|
switchNamespace(namespaceId) {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ export default Ember.Component.extend({
|
||||||
machine: null,
|
machine: null,
|
||||||
settings: Ember.inject.service(),
|
settings: Ember.inject.service(),
|
||||||
|
|
||||||
didInitAttrs() {
|
didReceiveAttrs() {
|
||||||
if ( !this.get('machine.engineInstallUrl') )
|
if ( !this.get('machine.engineInstallUrl') )
|
||||||
{
|
{
|
||||||
this.set('machine.engineInstallUrl', this.get(`settings.${C.SETTING.ENGINE_URL}`) || '');
|
this.set('machine.engineInstallUrl', this.get(`settings.${C.SETTING.ENGINE_URL}`) || '');
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@ export default Ember.Service.extend(BrowserStore, {
|
||||||
var old = event.originalEvent.oldValue;
|
var old = event.originalEvent.oldValue;
|
||||||
var neu = event.originalEvent.newValue;
|
var neu = event.originalEvent.newValue;
|
||||||
|
|
||||||
console.log('Change', key, '=', old, '->', neu);
|
|
||||||
|
|
||||||
if ( old !== neu )
|
if ( old !== neu )
|
||||||
{
|
{
|
||||||
this.notifyPropertyChange(key);
|
this.notifyPropertyChange(key);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ui",
|
"name": "ui",
|
||||||
"version": "1.0.7",
|
"version": "1.0.8",
|
||||||
"private": true,
|
"private": true,
|
||||||
"directories": {
|
"directories": {
|
||||||
"doc": "doc",
|
"doc": "doc",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue