consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed User::public_activity scope

Browse Source
This commit is contained in:
Alberto Miedes Garcés
2016-12-26 18:42:12 +01:00
parent 5daf59e813
commit 2311cd4b1d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/debate.rb
View File

@@ -13,6 +13,7 @@ class Debate < ActiveRecord::Base
include ActsAsParanoidAliases include ActsAsParanoidAliases
belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
belongs_to :public_author, -> { with_public_activity }, class_name: 'User', foreign_key: 'author_id'
belongs_to :geozone belongs_to :geozone
has_many :comments, as: :commentable has_many :comments, as: :commentable

2
app/models/proposal.rb
View File

@@ -14,7 +14,7 @@ class Proposal < ActiveRecord::Base
RETIRE_OPTIONS = %w(duplicated started unfeasible done other) RETIRE_OPTIONS = %w(duplicated started unfeasible done other)
belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
belongs_to :public_author, -> { public_activity }, class_name: 'User', foreign_key: 'author_id' belongs_to :public_author, -> { with_public_activity }, class_name: 'User', foreign_key: 'author_id'
belongs_to :geozone belongs_to :geozone
has_many :comments, as: :commentable has_many :comments, as: :commentable
has_many :proposal_notifications has_many :proposal_notifications

2
app/models/user.rb
View File

@@ -54,7 +54,7 @@ class User < ActiveRecord::Base
scope :by_document, -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) } scope :by_document, -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) }
scope :email_digest, -> { where(email_digest: true) } scope :email_digest, -> { where(email_digest: true) }
scope :active, -> { where(erased_at: nil) } scope :active, -> { where(erased_at: nil) }
scope :public_activity, -> { where(public_activity: true) } scope :with_public_activity, -> { where(public_activity: true) }
before_validation :clean_document_number before_validation :clean_document_number