gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

suggested changes

Browse source 
change description of organization_admin
remove assign_role callback
This commit is contained in:
shlok007 2017-06-14 22:51:26 +05:30
parent 8839a928ed
commit 7d408ee33c
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/organizations_controller.rb
View file

@ -1,7 +1,6 @@
module Admin
class OrganizationsController < Admin::BaseController
load_and_authorize_resource :organization
after_action :assign_role, only: :create
def index
@organizations = Organization.all
@ -46,10 +45,6 @@ module Admin
private
def assign_role
current_user.add_role :organization_admin, @organization
end
def organization_params
params.require(:organization).permit(:name, :description, :picture)
end

2
app/models/organization.rb
View file

@ -12,6 +12,6 @@ class Organization < ActiveRecord::Base
private
def create_roles
Role.where(name: 'organization_admin', resource: self).first_or_create(description: "For the administrators of an organization (who shall have full access to the organization and it's conferences)")
roles.where(name: 'organization_admin').first_or_create(description: 'For the administrators of an organization and its conferences')
end
end

2
lib/tasks/roles.rake
View file

@ -3,7 +3,7 @@ namespace :roles do
task add: :environment do
Organization.all.each do |org|
Role.where(name: 'organization_admin', resource: org).first_or_create(description: "For the administrators of an organization (who shall have full access to the organization and it's conferences)")
Role.where(name: 'organization_admin', resource: org).first_or_create(description: 'For the administrators of an organization and its conferences')
end
Conference.all.each do |c|