public/js/models/groupRecord.js in conjur-asset-ui-1.3.1 vs public/js/models/groupRecord.js in conjur-asset-ui-1.3.2
- old
+ new
@@ -1,7 +1,5 @@
-/* global conjur, jQuery, async */
-
(function(conjur, $, async, errback) {
'use strict';
var Generic = this.Generic;
@@ -18,37 +16,38 @@
};
Group.prototype = Object.create(Generic.prototype);
Group.prototype.constructor = Group;
- Group.prototype.fetch = function(callback, customErrback) {
- var id = this.id;
+ Group.prototype.fetch = function(callback, custom_errback) {
+ var self = this,
+ id = this.id;
- if (typeof(customErrback) === 'undefined') {
- customErrback = errback; // reset to default
+ if (typeof(custom_errback) === 'undefined') {
+ custom_errback = errback; // reset to default
}
async.parallel([
this.attributes.bind(this),
this.ownedResources.bind(this),
function(cb) {
$.ajax({
- url: '/api/authz/' +
- conjur.app.configuration.account +
- '/roles/group/' +
- id +
- '?members',
+ url: '/api/authz/'
+ + conjur.app.configuration.account
+ + '/roles/group/'
+ + id
+ + '?members',
success: function(result) {
cb(null, result);
},
error: cb
});
},
this.allRoles.bind(this),
this.resource.bind(this)
], function(err, results) {
if (err) {
- return customErrback(err.status);
+ return custom_errback(err.status);
}
callback({
group: results[0],
owned: results[1],