Download as
Browse Code »

Commit dbc3b3180ca1b73f655b4e8480405065264fb4d1

Authored by Antonio Terceiro
1 parent 8395567c
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem1165: testing for a resource before

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
db/migrate/069_add_enviroment_id_to_role.rb
  Diff comments   View file @dbc3b31
@@ -19,7 +19,7 @@ class AddEnviromentIdToRole < ActiveRecord::Migration @@ -19,7 +19,7 @@ class AddEnviromentIdToRole < ActiveRecord::Migration
19 re = RoleWithEnvironment.new(role.attributes) 19 re = RoleWithEnvironment.new(role.attributes)
20 re.environment = env 20 re.environment = env
21 re.save 21 re.save
22 - RoleAssignment.find_all_by_role_id(role.id).select{|ra| (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }.each do |ra| 22 + RoleAssignment.find_all_by_role_id(role.id).select{|ra| ra.resource && (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }.each do |ra|
23 ra.role_id = re.id 23 ra.role_id = re.id
24 ra.save 24 ra.save
25 end 25 end