Download as
Browse Code »

Commit 9a6bf3c266b72fbbd99d82896e3e37529d5db5c2

Authored by Rodrigo Souto
2 parents 52439958 b084242c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'fix_custom_roles_management' into 'master' 

Fix custom roles management

This patch updates the schema to add profile_id on roles table and fix the broken custom role creation and task management.

See merge request !570
Showing 3 changed files with 4 additions and 2 deletions   Show diff stats
app/controllers/my_profile/profile_roles_controller.rb
  Diff comments   View file @9a6bf3c
@@ -11,8 +11,9 @@ class ProfileRolesController < MyProfileController @@ -11,8 +11,9 @@ class ProfileRolesController < MyProfileController
11 end 11 end
12 12
13 def create 13 def create
14 - @role = Role.create({:name => params[:role][:name], :permissions => params[:role][:permissions], :profile_id => profile.id, :environment => environment }, :without_protection => true) 14 + @role = Role.new({:name => params[:role][:name], :permissions => params[:role][:permissions], :environment => environment }, :without_protection => true)
15 if @role.save 15 if @role.save
  16 + profile.custom_roles << @role
16 redirect_to :action => 'show', :id => @role 17 redirect_to :action => 'show', :id => @role
17 else 18 else
18 session[:notice] = _('Failed to create role') 19 session[:notice] = _('Failed to create role')
app/views/tasks/_add_member_accept_details.html.erb
  Diff comments   View file @9a6bf3c
1 <%= content = _("Roles:")+"<br />" 1 <%= content = _("Roles:")+"<br />"
2 -roles = Profile::Roles.organization_all_roles(task.target.environment.id) 2 +roles = Profile::Roles.organization_member_roles(task.target.environment.id) + profile.custom_roles
3 roles.each do |role| 3 roles.each do |role|
4 content += labelled_check_box(role.name, "tasks[#{task.id}][task][roles][]", role.id, false)+"<br />" 4 content += labelled_check_box(role.name, "tasks[#{task.id}][task][roles][]", role.id, false)+"<br />"
5 end 5 end
@@ -593,6 +593,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do @@ -593,6 +593,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do
593 t.boolean "system", :default => false 593 t.boolean "system", :default => false
594 t.text "permissions" 594 t.text "permissions"
595 t.integer "environment_id" 595 t.integer "environment_id"
  596 + t.integer "profile_id"
596 end 597 end
597 598
598 create_table "scraps", :force => true do |t| 599 create_table "scraps", :force => true do |t|