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

Merge branch 'master' into question-answer-documents

Browse Source
This commit is contained in:
decabeza
2017-10-06 15:18:42 +02:00
parent 8dd1d6d947 108d4104e8
commit dd69401477
8 changed files with 2 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/admin/poll/questions/_form.html.erb
View File

@@ -4,7 +4,6 @@
<%= f.hidden_field :proposal_id %>
<div class="small-12">
<div class="small-12 medium-6 large-4">
<%= f.select :poll_id,
@@ -15,10 +14,6 @@
<%= f.text_field :title, maxlength: Poll::Question.title_max_length %>
<div class="documents small-12">
<%= render 'documents/nested_documents', documentable: @question, f: f %>
</div>
<div class="small-12">
<%= f.label :video_url, t("proposals.form.proposal_video_url") %>
<p class="help-text" id="video-url-help-text"><%= t("proposals.form.proposal_video_url_note") %></p>

8
app/views/admin/poll/questions/show.html.erb
View File

@@ -79,11 +79,3 @@
<a href="<%= @question.video_url %>"><%= @question.video_url %></a>
</p>
<% end %>
<% if @question.documents.any? %>
<p>
<strong><%= t("admin.questions.show.documents") %></strong>
<br>
<a href="<%= @question.documents.first.attachment.url %>"><%= @question.documents.first.title %></a>
</p>
<% end %>