Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Finished Ingredient#create validations

Browse Source
This commit is contained in:
cryptogopher
2019-09-15 18:53:00 +02:00
parent 0dcb13a065
commit 893e2646d0
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/ingredients/_form.html.erb
View File

@@ -11,13 +11,13 @@
<%= f.fields_for 'nutrients_attributes', n, index: '' do |ff| %>
<p class="nutrient">
<%= ff.select :quantity_id, quantity_options,
label: (index > 0 ? '' : :field_nutrients) %>
{include_blank: true, label: (index > 0 ? '' : :field_nutrients)} %>
<%= ff.number_field :amount, {size: 8, min: 0, step: :any, label: ''} %>
<%= ff.select :unit_id, unit_options, label: '' %>
<%= ff.select :unit_id, unit_options, {label: ''} %>
<%= ff.check_box :_destroy, {style: "display:none", label: ''} %>
<%= link_to t(".button_delete_nutrient"), '#',
:class => 'icon icon-del',
:style => "display:none",
:style => (@ingredient.nutrients.length > 1 ? "" : "display:none"),
:onclick => "deleteNutrient(); return false;" %>
</p>
<% end %>
@@ -41,7 +41,8 @@
function deleteNutrient() {
var row = $(event.target).closest('p.nutrient');
row.find('[id$=_destroy]').val(1);
row.hide();
// FIXME: should only hide() row if record already saved (to send _destroy to backend)
row.remove();
$('p.nutrient:visible:first label:first').text('<%= t "field_nutrients" %>');
if ($('p.nutrient:visible').length <= 1) {
$('p.nutrient a.icon-del').hide();