avoids use class variables on helper
This commit is contained in:
@@ -32,16 +32,16 @@ module ProposalsHelper
|
|||||||
Proposal::RETIRE_OPTIONS.collect { |option| [ t("proposals.retire_options.#{option}"), option ] }
|
Proposal::RETIRE_OPTIONS.collect { |option| [ t("proposals.retire_options.#{option}"), option ] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def can_create_document?
|
def can_create_document?(document, proposal)
|
||||||
can?(:create, @document) && @proposal.documents.size < Proposal.max_documents_allowed
|
can?(:create, document) && proposal.documents.size < Proposal.max_documents_allowed
|
||||||
end
|
end
|
||||||
|
|
||||||
def author_of_proposal?
|
def author_of_proposal?(proposal)
|
||||||
author_of?(@proposal, current_user)
|
author_of?(proposal, current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_editable?
|
def current_editable?(proposal)
|
||||||
current_user && @proposal.editable_by?(current_user)
|
current_user && proposal.editable_by?(current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
@@ -104,11 +104,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<aside class="small-12 medium-3 column">
|
<aside class="small-12 medium-3 column">
|
||||||
<% if can_create_document? || author_of_proposal? || current_editable? %>
|
<% if can_create_document?(@document, @proposal) || author_of_proposal?(@proposal) || current_editable?(@proposal) %>
|
||||||
<div class="sidebar-divider"></div>
|
<div class="sidebar-divider"></div>
|
||||||
<h2><%= t("proposals.show.author") %></h2>
|
<h2><%= t("proposals.show.author") %></h2>
|
||||||
<div class="show-actions-menu">
|
<div class="show-actions-menu">
|
||||||
<% if can_create_document? %>
|
<% if can_create_document?(@document, @proposal) %>
|
||||||
<%= link_to new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url),
|
<%= link_to new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url),
|
||||||
class: 'button hollow expanded' do %>
|
class: 'button hollow expanded' do %>
|
||||||
<span class="icon-document"></span>
|
<span class="icon-document"></span>
|
||||||
@@ -116,7 +116,7 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if author_of_proposal? %>
|
<% if author_of_proposal?(@proposal) %>
|
||||||
<%= link_to new_proposal_notification_path(proposal_id: @proposal.id),
|
<%= link_to new_proposal_notification_path(proposal_id: @proposal.id),
|
||||||
class: 'button hollow expanded' do %>
|
class: 'button hollow expanded' do %>
|
||||||
<span class="icon-no-notification"></span>
|
<span class="icon-no-notification"></span>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if current_editable? %>
|
<% if current_editable?(@proposal) %>
|
||||||
<%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow expanded' do %>
|
<%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow expanded' do %>
|
||||||
<span class="icon-edit"></span>
|
<span class="icon-edit"></span>
|
||||||
<%= t("proposals.show.edit_proposal_link") %>
|
<%= t("proposals.show.edit_proposal_link") %>
|
||||||
|
|||||||
Reference in New Issue
Block a user