github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

made scopes robust against deep links

pull/779/head
Justin Richer 2015-02-27 10:15:36 -05:00
parent 45754d3b75
commit c8cf2abbd9
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
View File

@ -882,9 +882,11 @@ var AppRouter = Backbone.Router.extend({
var scope = new SystemScopeModel();
this.systemScopeFormView = new SystemScopeFormView({model:scope});
$('#content').html(this.systemScopeFormView.render().el);
setPageTitle($.t('scope.system-scope-form.new'));
var view = new SystemScopeFormView({model:scope});
view.load(function() {
$('#content').html(view.render().el);
setPageTitle($.t('scope.system-scope-form.new'));
});
},
@ -905,10 +907,15 @@ var AppRouter = Backbone.Router.extend({
this.updateSidebar('admin/scope');
var scope = this.systemScopeList.get(sid);
if (!scope) {
scope = new SystemScopeModel({id: sid});
}
this.systemScopeFormView = new SystemScopeFormView({model:scope});
$('#content').html(this.systemScopeFormView.render().el);
setPageTitle($.t('scope.system-scope-form.edit'));
var view = new SystemScopeFormView({model:scope});
view.load(function() {
$('#content').html(view.render().el);
setPageTitle($.t('scope.system-scope-form.new'));
});
},

19
openid-connect-server-webapp/src/main/webapp/resources/js/scope.js
View File

@ -284,6 +284,25 @@ var SystemScopeFormView = Backbone.View.extend({
'change #isStructured input':'toggleStructuredParamDescription'
},
load:function(callback) {
if (this.model.isFetched) {
callback();
return;
}
$('#loadingbox').sheet('show');
$('#loading').html(
'<span class="label" id="loading-scopes">' + $.t("common.scopes") + '</span> '
);
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
.done(function() {
$('#loadingbox').sheet('hide');
callback();
});
},
toggleStructuredParamDescription:function(e) {
if ($('#isStructured input', this.el).is(':checked')) {
$('#structuredParamDescription', this.el).show();