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

Don’t show new annotation/comment form if allegations phase is not open

Browse Source
This commit is contained in:
Amaia Castro
2017-01-16 17:42:32 +01:00
parent 819c9efcc3
commit 65fcd83ee5
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/legislation/annotations/_form.html.erb
View File

@@ -8,7 +8,11 @@
<div class="comments-wrapper">
<div class="comment-input">
<% if user_signed_in? %>
<% if !@process.open_phase?(:allegations) %>
<div data-alert class="callout primary">
<%= t("legislation.annotations.form.phase_not_open") %>
</div>
<% elsif user_signed_in? %>
<%= form_for Legislation::Annotation.new, url: legislation_process_draft_version_annotations_path(@process, @draft_version), remote: true do |f| %>
<%= f.text_area :text %>
@@ -22,10 +26,10 @@
<% end %>
<% else %>
<div data-alert class="callout primary">
<%= t("debates.show.login_to_comment",
signin: link_to(t("votes.signin"), new_user_session_path),
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
</div>
<%= t("legislation.annotations.form.login_to_comment",
signin: link_to(t("legislation.annotations.form.signin"), new_user_session_path),
signup: link_to(t("legislation.annotations.form.signup"), new_user_registration_path)).html_safe %>
</div>
<% end %>
</div>
</div>

1
app/views/legislation/draft_versions/show.html.erb
View File

@@ -54,6 +54,7 @@
<section class="legislation-annotatable"
data-legislation-draft-version-id="<%= @draft_version.id %>"
data-legislation-annotatable-base-url="<%= legislation_process_draft_version_path(@process, @draft_version) %>"
data-legislation-open-phase="<%= @process.open_phase?(:allegations) %>"
>
<% end %>
<%= @draft_version.body_html.html_safe %>