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

Merge branch 'master' into aperez-dates-for-milestones

Browse Source
This commit is contained in:
Alberto García
2017-12-14 20:50:55 +01:00
committed by GitHub
parent e675ceeb0a 09b544774d
commit 1737f85398
10 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/admin/budget_investment_milestones/_form.html.erb
View File

@@ -8,5 +8,10 @@
<%= render 'images/admin_image', imageable: @milestone, f: f %>
<hr>
<div class="documents">
<%= render 'documents/nested_documents', documentable: @milestone, f: f %>
</div>
<%= f.submit nil, class: "button success" %>
<% end %>

11
app/views/admin/budget_investments/_milestones.html.erb
View File

@@ -7,6 +7,7 @@
<th><%= t("admin.milestones.index.table_description") %></th>
<th><%= t("admin.milestones.index.table_publication_date") %></th>
<th><%= t("admin.milestones.index.image") %></th>
<th><%= t("admin.milestones.index.documents") %></th>
<th><%= t("admin.milestones.index.table_actions") %></th>
</tr>
</thead>
@@ -29,6 +30,16 @@
milestone.image_url(:large),
target: :_blank if milestone.image.present? %>
</td>
<td class="small">
<% if milestone.documents.present? %>
<% milestone.documents.each do |document| %>
<%= link_to document.title,
document.attachment.url,
target: "_blank",
rel: "nofollow" %><br>
<% end %>
<% end %>
</td>
<td>
<%= link_to t("admin.milestones.index.delete"),
admin_budget_budget_investment_budget_investment_milestone_path(@investment.budget,