Skip to content
Snippets Groups Projects
Commit 535684be authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

Replace all ChatPermissions

parent 9346f259
No related branches found
No related tags found
No related merge requests found
...@@ -16,13 +16,15 @@ Package.onUse(function(api) { ...@@ -16,13 +16,15 @@ Package.onUse(function(api) {
api.use('templating', 'client'); api.use('templating', 'client');
api.addFiles('lib/permissions.coffee', ['server', 'client']);
api.addFiles('lib/rocketchat.coffee', ['server','client']); api.addFiles('lib/rocketchat.coffee', ['server','client']);
api.addFiles('client/collection.coffee', ['server', 'client']);
api.addFiles('client/startup.coffee', ['client']); api.addFiles('client/startup.coffee', ['client']);
api.addFiles('client/hasPermission.coffee', ['client']); api.addFiles('client/hasPermission.coffee', ['client']);
api.addFiles('client/hasRole.coffee', ['client']); api.addFiles('client/hasRole.coffee', ['client']);
api.addFiles('server/models/Permissions.coffee', ['server']);
api.addFiles('server/functions/addUsersToRoles.coffee', ['server']); api.addFiles('server/functions/addUsersToRoles.coffee', ['server']);
api.addFiles('server/functions/getPermissionsForRole.coffee', ['server']); api.addFiles('server/functions/getPermissionsForRole.coffee', ['server']);
api.addFiles('server/functions/getRoles.coffee', ['server']); api.addFiles('server/functions/getRoles.coffee', ['server']);
......
...@@ -6,4 +6,4 @@ RocketChat.authz.getPermissionsForRole = (roleName) -> ...@@ -6,4 +6,4 @@ RocketChat.authz.getPermissionsForRole = (roleName) ->
unless roleName in roleNames unless roleName in roleNames
throw new Meteor.Error 'invalid-role' throw new Meteor.Error 'invalid-role'
return _.pluck(ChatPermissions.find({roles : roleName }).fetch(), '_id') return _.pluck(RocketChat.models.Permissions.findByRole( roleName ).fetch(), '_id')
\ No newline at end of file
RocketChat.models.Permissions = new class extends RocketChat.models._Base
constructor: ->
@_initModel 'permissions'
# FIND
findByRole: (role, options) ->
query =
role: role
return @findOne query, options
Meteor.publish 'permissions', -> Meteor.publish 'permissions', ->
console.log '[publish] permissions'.green console.log '[publish] permissions'.green
return ChatPermissions.find {} return RocketChat.models.Permissions.find {}
\ No newline at end of file
...@@ -78,7 +78,7 @@ Meteor.startup -> ...@@ -78,7 +78,7 @@ Meteor.startup ->
roles = _.pluck(Roles.getAllRoles().fetch(), 'name'); roles = _.pluck(Roles.getAllRoles().fetch(), 'name');
for permission in permissions for permission in permissions
ChatPermissions.upsert( permission._id, {$setOnInsert : permission }) RocketChat.models.Permissions.upsert( permission._id, {$setOnInsert : permission })
for role in permission.roles for role in permission.roles
unless role in roles unless role in roles
Roles.createRole role Roles.createRole role
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment