Fix cancel and restart buttons
Callback functions for restart and cancel where improperly updated while switching from coffeescript to javascript.
This commit is contained in:
parent
561e671e0d
commit
7649c180dd
|
@ -29,9 +29,7 @@ export default Ember.Mixin.create({
|
||||||
}
|
}
|
||||||
this.set('restarting', true);
|
this.set('restarting', true);
|
||||||
onFinished = () => {
|
onFinished = () => {
|
||||||
return function() {
|
this.set('restarting', false);
|
||||||
return this.set('restarting', false);
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
return this.get('item').restart().then(onFinished, onFinished);
|
return this.get('item').restart().then(onFinished, onFinished);
|
||||||
},
|
},
|
||||||
|
@ -41,31 +39,28 @@ export default Ember.Mixin.create({
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.set('cancelling', true);
|
this.set('cancelling', true);
|
||||||
|
|
||||||
type = this.get('type');
|
type = this.get('type');
|
||||||
return this.get('item').cancel().then(() => {
|
return this.get('item').cancel().then(() => {
|
||||||
return function() {
|
this.set('cancelling', false);
|
||||||
this.set('cancelling', false);
|
return Travis.flash({
|
||||||
|
success: (type.capitalize()) + " has been successfully canceled."
|
||||||
|
});
|
||||||
|
}, (xhr) => {
|
||||||
|
this.set('cancelling', false);
|
||||||
|
if (xhr.status === 422) {
|
||||||
return Travis.flash({
|
return Travis.flash({
|
||||||
success: (type.capitalize()) + " has been successfully canceled."
|
error: "This " + type + " can't be canceled"
|
||||||
});
|
});
|
||||||
};
|
} else if (xhr.status === 403) {
|
||||||
}, () => {
|
return Travis.flash({
|
||||||
return function(xhr) {
|
error: "You don't have sufficient access to cancel this " + type
|
||||||
this.set('cancelling', false);
|
});
|
||||||
if (xhr.status === 422) {
|
} else {
|
||||||
return Travis.flash({
|
return Travis.flash({
|
||||||
error: "This " + type + " can't be canceled"
|
error: "An error occured when canceling the " + type
|
||||||
});
|
});
|
||||||
} else if (xhr.status === 403) {
|
}
|
||||||
return Travis.flash({
|
|
||||||
error: "You don't have sufficient access to cancel this " + type
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return Travis.flash({
|
|
||||||
error: "An error occured when canceling the " + type
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user