1
0

Added zero_nil to Ingredients filter formula

Displaying formulas errors for Nutrients view
Substituted onblur for Ingredients filters with hidden submit
This commit is contained in:
cryptogopher
2020-03-22 01:02:37 +01:00
parent c3b783e942
commit 10325c9c39
6 changed files with 30 additions and 24 deletions

View File

@@ -9,20 +9,16 @@
<table class="filter">
<tr>
<td>
<%= text_field_tag 'filters[name]', session[:i_filters][:name], placeholder: 'name',
onblur: '$("#filters-form").submit(); return false;' %>
<%= text_field_tag 'name', session[:i_filters][:name], placeholder: 'name' %>
</td>
<td>
<%= select_tag 'filters[visibility]',
visibility_options(session[:i_filters][:visibility]),
prompt: t('.visibility_prompt'),
onchange: '$("#filters-form").submit();' %>
<%= select_tag 'visibility', visibility_options(session[:i_filters][:visibility]),
prompt: t('.visibility_prompt'), onchange: '$("#filters-form").submit();' %>
</td>
<td style="width:100%;">
<%= text_field_tag 'filters[formula]', session[:i_filters][:formula],
<%= text_field_tag 'formula[code]', session[:i_filters][:formula][:code],
placeholder: 'conditional expression including nutrients', size: 40,
style: 'box-sizing:border-box; width:100%;',
onblur: '$("#filters-form").submit(); return false;' %>
style: 'box-sizing:border-box; width:100%;' %>
</td>
<td>
<%= link_to l(:button_apply), '#', class: "icon icon-checked",
@@ -34,7 +30,20 @@
$("#filters-form").submit(); return false;' %>
</td>
</tr>
<tr>
<td></td>
<td></td>
<td style="padding-top:4px;">
<%= label_tag do %>
<%= check_box_tag 'formula[zero_nil]', session[:i_filters][:formula][:zero_nil] %>
<%= t 'quantities.form.zero_nil' %>
<% end %>
</td>
<td></td>
<td></td>
</tr>
</table>
<%= submit_tag '', style: 'display:none;' %>
<% end %>
</div>
</fieldset>

View File

@@ -4,7 +4,7 @@
<% if @ingredients.any? %>
<%= render partial: 'ingredients/options' %>
<%= error_messages_for *@quantities.map { |q| q.formula } %>
<%= error_messages_for @formula_q.formula, *@quantities.map { |q| q.formula } %>
<table class="nutrients list odd-even">
<thead>