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

Adds organization_name attribute to budget investments

Browse Source
This commit is contained in:
kikito
2017-01-06 18:43:55 +01:00
parent 54691fe7f4
commit 3c9e08b06f
9 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/budgets/investments/_form.html.erb
View File

@@ -3,30 +3,29 @@
<div class="row">
<div class="small-12 medium-8 column">
<%= f.label :heading_id, t("budget.investments.form.heading") %>
<%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, label: false} %>
<%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, } %>
</div>
<div class="small-12 column">
<%= f.label :title, t("budget.investments.form.title") %>
<%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("budget.investments.form.title"), label: false %>
<%= f.text_field :title, maxlength: SpendingProposal.title_max_length %>
</div>
<%= f.invisible_captcha :subtitle %>
<div class="ckeditor small-12 column">
<%= f.label :description, t("budget.investments.form.description") %>
<%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
<%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %>
</div>
<div class="small-12 column">
<%= f.label :external_url, t("budget.investments.form.external_url") %>
<%= f.text_field :external_url, placeholder: t("budget.investments.form.external_url"), label: false %>
<%= f.text_field :external_url %>
</div>
<div class="small-12 column">
<%= f.label :location, t("budget.investments.form.location") %>
<%= f.text_field :location, placeholder: t("budget.investments.form.location"), label: false %>
<%= f.text_field :location %>
</div>
<div class="small-12 column">
<%= f.text_field :organization_name %>
</div>
<% unless current_user.manager? %>
@@ -45,7 +44,7 @@
<% end %>
<div class="actions small-12 medium-6 large-4 end column">
<%= f.submit(class: "button expanded", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
<%= f.submit(nil, class: "button expanded") %>
</div>
</div>
<% end %>

8
app/views/budgets/investments/_investment_show.html.erb
View File

@@ -24,11 +24,17 @@
</p>
<% if investment.location.present? %>
<p id="investment_code">
<p>
<%= t("budget.investments.show.location_html", location: investment.location) %>
</p>
<% end %>
<% if investment.organization_name.present? %>
<p>
<%= t("budget.investments.show.organization_name_html", name: investment.organization_name) %>
</p>
<% end %>
<%= safe_html_with_links investment.description.html_safe %>
<% if investment.external_url.present? %>