From 9d0d4a7861684d407dd341c0e762aa7035be237f Mon Sep 17 00:00:00 2001 From: Derek Chen Date: Fri, 16 Aug 2019 22:00:55 +0800 Subject: [PATCH] fix got blank page when CAS auth failure --- gui/app/pods/auth/cas/route.js | 11 +++++------ gui/app/pods/auth/cas/template.hbs | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gui/app/pods/auth/cas/route.js b/gui/app/pods/auth/cas/route.js index 3b90d745..f16bd701 100644 --- a/gui/app/pods/auth/cas/route.js +++ b/gui/app/pods/auth/cas/route.js @@ -23,12 +23,11 @@ export default Route.extend({ refreshModel: true }, ticket : { - refreshModel: true, - replace : true, + refreshModel: true } }, message: '', - + mode: 'login', afterModel(model) { return new EmberPromise((resolve) => { let constants = this.get('constants'); @@ -45,11 +44,11 @@ export default Route.extend({ this.transitionTo('folders'); }, (reject) => { if (!_.isUndefined(reject.Error)) { - this.set('message', reject.Error); + model.message = reject.Error; } else { - this.set('message', reject); + model.message = reject.Error; } - this.set('mode', 'reject'); + model.mode = 'reject'; resolve(); }); diff --git a/gui/app/pods/auth/cas/template.hbs b/gui/app/pods/auth/cas/template.hbs index 30b468f6..c61afd04 100644 --- a/gui/app/pods/auth/cas/template.hbs +++ b/gui/app/pods/auth/cas/template.hbs @@ -8,6 +8,5 @@ {{#if (is-equal model.mode "reject")}}

CAS authentication failure

-

{{model.message}}

{{/if}}