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

fixed some bugs in whitelist rendering and saving

pull/779/head
Justin Richer 2015-02-26 21:17:40 -05:00
parent 692e8418d6
commit d570497b16
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,9 +738,7 @@ var AppRouter = Backbone.Router.extend({
this.updateSidebar('admin/whitelists'); this.updateSidebar('admin/whitelists');
//// var whiteList = new WhiteListModel();
var whiteList = this.whiteListList.get(id);
whiteList = new WhiteListModel({id: id});
var client = this.clientList.get(cid); var client = this.clientList.get(cid);
if (!client) { if (!client) {
@ -751,6 +749,10 @@ var AppRouter = Backbone.Router.extend({
view.load( view.load(
function() { function() {
// set the scopes on the model now that everything's loaded
whiteList.set({allowedScopes: client.get('scope')}, {silent: true});
$('#content').html(view.render().el); $('#content').html(view.render().el);
view.delegateEvents(); view.delegateEvents();
setPageTitle($.t('whitelist.manage')); setPageTitle($.t('whitelist.manage'));

2
openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js
View File

@ -341,7 +341,7 @@ var WhiteListFormView = Backbone.View.extend({
// process allowed scopes // process allowed scopes
var allowedScopes = this.scopeCollection.pluck("item"); var allowedScopes = this.scopeCollection.pluck("item");
this.model.set(this.options.client.get('clientId')); this.model.set({clientId: this.options.client.get('clientId')}, {silent: true});
var valid = this.model.set({ var valid = this.model.set({
allowedScopes: allowedScopes allowedScopes: allowedScopes