Download as
Browse Code »

Commit 6adcfdc472a76cd0390a3dd32ca34409d76e4800

Authored by Rodrigo Souto
1 parent 3241d6a8
Exists in master and in 12 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_sign_up_form, forum_topic_creation, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.5, web_steps_improvements

fix merge mistake

Showing 2 changed files with 1 additions and 14 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @6adcfdc
... ... @@ -77,15 +77,12 @@ class Article < ActiveRecord::Base
77 77 belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
78 78 belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
79 79  
80   -<<<<<<< 6fa2f904983046ed816efe293ba9dcad19a67a4b
81 80 has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
82 81  
83   -=======
84   - has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
85 82 has_many :article_followers, :dependent => :destroy
86 83 has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
87 84 has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email
88   ->>>>>>> Add feature: Article Followers
  85 +
89 86 has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
90 87 has_many :categories, :through => :article_categorizations
91 88  
... ...
plugins/people_block/lib/ext/person.rb
View file @3241d6a
... ... @@ -1,10 +0,0 @@
1   -require_dependency 'person'
2   -
3   -class Person
4   -
5   - scope :with_role, -> role_id {
6   - joins(:role_assignments).
7   - where("role_assignments.role_id = #{role_id}")
8   - }
9   -
10   -end