Download as
Browse Code »

Commit 30c9ba4d3e141881c2d41da239711623370f36cb

Authored by Leandro Santos
1 parent 685d4964
Exists in staging and in 26 other branches angular_poc, api-article-archived, api-homepage, api_visitor, article-readonly, caching-rails4, captcha_serpro_plugin, comment_paragraph_api, comments_api_reply, content-manager-hostspot, environment-api, export-comment-paragraph, fix_event_date_issue, fix_multitenancy, fix_profile_wall, fix_string_downcase_and_upcase, fix_upload_files_on_development_environment, json_cookie_serializer, login-captcha, master, new_security, new_video_plugin, pg_search_rank, production, resend_confirmation_email, tasks_keep_filter_params

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