several bugfixes to scopes UI, works now
parent
e5171a196a
commit
801a45cc49
|
@ -61,7 +61,7 @@ public class ScopeAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||||
@RequestMapping(value = "/id", method = RequestMethod.PUT, produces = "application/json", consumes = "application/json")
|
@RequestMapping(value = "/{id}", method = RequestMethod.PUT, produces = "application/json", consumes = "application/json")
|
||||||
public String updateScope(@PathVariable("id") Long id, @RequestBody String json, ModelMap m) {
|
public String updateScope(@PathVariable("id") Long id, @RequestBody String json, ModelMap m) {
|
||||||
|
|
||||||
SystemScope existing = scopeService.getById(id);
|
SystemScope existing = scopeService.getById(id);
|
||||||
|
|
|
@ -194,17 +194,6 @@
|
||||||
var SystemScopeModel = Backbone.Model.extend({
|
var SystemScopeModel = Backbone.Model.extend({
|
||||||
idAttribute: 'id',
|
idAttribute: 'id',
|
||||||
|
|
||||||
/*
|
|
||||||
// fake the 'item' portion
|
|
||||||
get: function (attr) {
|
|
||||||
if (attr == 'item') {
|
|
||||||
attr = 'value';
|
|
||||||
}
|
|
||||||
|
|
||||||
return Backbone.Model.prototype.get.call(this, attr);
|
|
||||||
},
|
|
||||||
*/
|
|
||||||
|
|
||||||
defaults:{
|
defaults:{
|
||||||
id:null,
|
id:null,
|
||||||
description:null,
|
description:null,
|
||||||
|
@ -1156,13 +1145,13 @@
|
||||||
|
|
||||||
events:{
|
events:{
|
||||||
'click .btn-save':'saveScope',
|
'click .btn-save':'saveScope',
|
||||||
'click .btn-cancel': function() {window.history.back(); return false; }
|
'click .btn-cancel': function() {app.navigate('admin/scope', {trigger: true}); }
|
||||||
},
|
},
|
||||||
|
|
||||||
saveScope:function(event) {
|
saveScope:function(event) {
|
||||||
var valid = this.model.set({
|
var valid = this.model.set({
|
||||||
value:$('#value input').val(),
|
value:$('#value input').val(),
|
||||||
description:$('#description input').val(),
|
description:$('#description textarea').val(),
|
||||||
defaultScope:$('#defaultScope input').is(':checked'),
|
defaultScope:$('#defaultScope input').is(':checked'),
|
||||||
allowDynReg:$('#allowDynReg input').is(':checked')
|
allowDynReg:$('#allowDynReg input').is(':checked')
|
||||||
});
|
});
|
||||||
|
@ -1179,6 +1168,8 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function(eventName) {
|
render: function(eventName) {
|
||||||
|
|
Loading…
Reference in New Issue