Download as
Browse Code »

Commit 30c9ba4d3e141881c2d41da239711623370f36cb

Authored by Leandro Santos
1 parent 685d4964
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

Fix CommunitiesBlock unit tests

Showing 4 changed files with 7 additions and 0 deletions   Show diff stats
app/models/communities_block.rb
  Diff comments   View file @30c9ba4
1 class CommunitiesBlock < ProfileListBlock 1 class CommunitiesBlock < ProfileListBlock
2 2
  3 + attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
  4 +
3 def self.description 5 def self.description
4 _('Communities') 6 _('Communities')
5 end 7 end
app/models/community.rb
  Diff comments   View file @30c9ba4
1 class Community < Organization 1 class Community < Organization
2 2
  3 + attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
3 def self.type_name 4 def self.type_name
4 _('Community') 5 _('Community')
5 end 6 end
vendor/plugins/access_control/lib/role_assignment.rb
  Diff comments   View file @30c9ba4
1 class RoleAssignment < ActiveRecord::Base 1 class RoleAssignment < ActiveRecord::Base
  2 +
  3 + attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
  4 +
2 belongs_to :role 5 belongs_to :role
3 belongs_to :accessor, :polymorphic => true 6 belongs_to :accessor, :polymorphic => true
4 belongs_to :resource, :polymorphic => true 7 belongs_to :resource, :polymorphic => true
vendor/plugins/action_tracker/lib/action_tracker_model.rb
  Diff comments   View file @30c9ba4
1 module ActionTracker 1 module ActionTracker
2 class Record < ActiveRecord::Base 2 class Record < ActiveRecord::Base
  3 + attr_accessible :verb, :params, :user, :target
3 4
4 set_table_name 'action_tracker' 5 set_table_name 'action_tracker'
5 6