Download as
Browse Code »

Commit 9a6bf3c266b72fbbd99d82896e3e37529d5db5c2

Authored by Rodrigo Souto
2 parents 52439958 b084242c
Exists in master and in 26 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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 11 end
12 12  
13 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 15 if @role.save
  16 + profile.custom_roles << @role
16 17 redirect_to :action => 'show', :id => @role
17 18 else
18 19 session[:notice] = _('Failed to create role')
... ...
app/views/tasks/_add_member_accept_details.html.erb
  Diff comments   View file @9a6bf3c
1 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 3 roles.each do |role|
4 4 content += labelled_check_box(role.name, "tasks[#{task.id}][task][roles][]", role.id, false)+"<br />"
5 5 end
... ...
db/schema.rb
  Diff comments   View file @9a6bf3c
... ... @@ -593,6 +593,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do
593 593 t.boolean "system", :default => false
594 594 t.text "permissions"
595 595 t.integer "environment_id"
  596 + t.integer "profile_id"
596 597 end
597 598  
598 599 create_table "scraps", :force => true do |t|
... ...