Commit 92a1c4942628c7663716326fd418b7bb1d9c9e1c
1 parent
29810616
Exists in
master
and in
3 other branches
Change scope name from private to private_proposals
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
lib/proposals_discussion_plugin/proposal.rb
| 1 | class ProposalsDiscussionPlugin::Proposal < TinyMceArticle | 1 | class ProposalsDiscussionPlugin::Proposal < TinyMceArticle |
| 2 | 2 | ||
| 3 | - scope :private, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}} | 3 | + scope :private_proposal, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}} |
| 4 | scope :from_discussion, lambda {|discussion| joins(:parent).where(['parents_articles.parent_id = ?', discussion.id])} | 4 | scope :from_discussion, lambda {|discussion| joins(:parent).where(['parents_articles.parent_id = ?', discussion.id])} |
| 5 | 5 | ||
| 6 | belongs_to :topic, :foreign_key => :parent_id, :class_name => 'ProposalsDiscussionPlugin::Topic' | 6 | belongs_to :topic, :foreign_key => :parent_id, :class_name => 'ProposalsDiscussionPlugin::Topic' |
views/content_viewer/_proposals_list.html.erb
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | <div id="fb-root"></div> | 3 | <div id="fb-root"></div> |
| 4 | 4 | ||
| 5 | -<% private_proposals = user ? holder.proposals.private(user) : [] %> | 5 | +<% private_proposals = user ? holder.proposals.private_proposal(user) : [] %> |
| 6 | <% unless private_proposals.empty? %> | 6 | <% unless private_proposals.empty? %> |
| 7 | <div class="private-proposals"> | 7 | <div class="private-proposals"> |
| 8 | <%= render :partial => 'content_viewer/proposal_card', :collection => private_proposals %> | 8 | <%= render :partial => 'content_viewer/proposal_card', :collection => private_proposals %> |