gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use.

Browse source
This commit is contained in:
Stella 2015-01-12 23:13:10 +02:00 • committed by Stella Rouzi
parent eda5c2bc07
commit ccd7ecbb90
59 changed files with 618 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -128,9 +128,9 @@ class User < ActiveRecord::Base
# * +Hash+ * -> e.g. 'organizer' => "(conf1, conf2)"
def get_roles
result = {}
Role::ACTIONABLES.each do |role|
resources = self.roles.where(name: role.parameterize.underscore).map{ |myrole| Conference.find(myrole.resource_id).short_title }.join ', '
result[role.parameterize.underscore] = "(#{ resources })" unless resources.blank?
Role.all.find_each do |role|
resources = self.roles.map{ |myrole| Conference.find(myrole.resource_id).short_title }.join ', '
result[role.name] = "(#{ resources })" unless resources.blank?
end
result
end