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

Merge pull request #2504 from consul/budget_group_name_edit

Browse Source 
Allow Budget Group names to be edited
This commit is contained in:
Raimond Garcia
2018-03-22 22:12:04 +01:00
committed by GitHub
parent 7fad642f8d c8562e64dd
commit c1d7378c92
12 changed files with 129 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/budget_groups/update.js.erb Normal file
View File

@@ -0,0 +1,6 @@
<% if @group.errors.any? %>
$("#group-form-<%= @group.id %>").html('<%= j render("admin/budgets/group_form", group: @group, budget: @group.budget, button_title: t("admin.budgets.form.submit"), id: "group-form-#{@group.id}", css_class: "group-toggle-#{@group.id}" ) %>');
<% else %>
$("#group-name-<%= @group.id %>").html('<%= @group.name %>')
$(".group-toggle-<%= @group.id %>").toggle()
<% end %>

29
app/views/admin/budgets/_group.html.erb
View File

@@ -2,31 +2,34 @@
<thead>
<tr>
<th colspan="4" class="with-button">
<%= group.name %>
<%= content_tag(:span, group.name, class:"group-toggle-#{group.id}", id:"group-name-#{group.id}") %>
<%= render 'admin/budgets/group_form', budget: @budget, group: group, id: "group-form-#{group.id}", button_title: t("admin.budgets.form.submit"), css_class: "group-toggle-#{group.id}" %>
<%= link_to t("admin.budgets.form.edit_group"), "#", class: "button float-right js-toggle-link hollow", data: { "toggle-selector" => ".group-toggle-#{group.id}" } %>
<%= link_to t("admin.budgets.form.add_heading"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#group-#{group.id}-new-heading-form" } %>
</th>
</tr>
<% if headings.blank? %>
</thead>
<tbody>
<tr>
<td colspan="4">
<div class="callout primary">
<%= t("admin.budgets.form.no_heading") %>
</div>
</td>
</tr>
<% else %>
<% if headings.present? %>
<tr>
<th><%= t("admin.budgets.form.table_heading") %></th>
<th class="text-right"><%= t("admin.budgets.form.table_amount") %></th>
<th class="text-right"><%= t("admin.budgets.form.table_population") %></th>
<th><%= t("admin.actions.actions") %></th>
</tr>
<% end %>
</thead>
<tbody>
<% end %>
<% if headings.blank? %>
<tr>
<td colspan="4">
<div class="callout primary">
<%= t("admin.budgets.form.no_heading") %>
</div>
</td>
</tr>
<% end %>
<tr id="group-<%= group.id %>-new-heading-form" style="display:none">
<td colspan="4">

15
app/views/admin/budgets/_group_form.html.erb Normal file
View File

@@ -0,0 +1,15 @@
<%= form_for [:admin, budget, group], html: {id: id, style: display_budget_goup_form(group), class: css_class}, remote: true do |f| %>
<%= f.label :name, t("admin.budgets.form.group") %>
<div class="input-group">
<%= f.text_field :name,
label: false,
maxlength: 50,
placeholder: t("admin.budgets.form.group"),
class: "input-group-field" %>
<div class="input-group-button">
<%= f.submit button_title, class: "button success" %>
</div>
</div>
<% end %>

18
app/views/admin/budgets/_groups.html.erb
View File

@@ -10,24 +10,10 @@
<%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
<% end %>
<%= form_for [:admin, @budget, Budget::Group.new], html: {id: "new-group-form", style: "display:none"}, remote: true do |f| %>
<%= f.label :name, t("admin.budgets.form.group") %>
<div class="input-group">
<%= f.text_field :name,
label: false,
maxlength: 50,
placeholder: t("admin.budgets.form.group"),
class: "input-group-field" %>
<div class="input-group-button">
<%= f.submit t("admin.budgets.form.create_group"), class: "button success" %>
</div>
</div>
<% end %>
<%= render 'admin/budgets/group_form', budget: @budget, group: Budget::Group.new, id: "new-group-form", button_title: t("admin.budgets.form.create_group"), css_class: '' %>
<% groups.each do |group| %>
<div id="<%= dom_id(group) %>">
<%= render "admin/budgets/group", group: group, headings: group.headings %>
<%= render "admin/budgets/group", group: group, headings: group.headings.order(:id) %>
</div>
<% end %>

2
app/views/admin/budgets/show.html.erb
View File

@@ -3,5 +3,5 @@
<h2><%= @budget.name %></h2>
<div id="<%= dom_id @budget %>_groups">
<%= render "groups", groups: @budget.groups %>
<%= render "groups", groups: @budget.groups.order(:id) %>
</div>