Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Moved flash messages display to partial

Browse Source
This commit is contained in:
cryptogopher 2019-12-26 20:00:52 +01:00
parent 79c30be601
commit e36e667ead
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/body_trackers/_flash.js.erb Normal file
View File

@ -0,0 +1,2 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= j render_flash_messages %>');

3
app/views/measurements/create.js.erb
View File

@ -1,5 +1,4 @@
$('div[id^=flash_]').remove(); <%= render partial: 'body_trackers/flash' %>
$('#content').prepend('<%= j render_flash_messages %>');
$('#new-measurement').empty(); $('#new-measurement').empty();
<% if defined? @quantities %> <% if defined? @quantities %>
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>'); $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');

3
app/views/measurements/destroy.js.erb
View File

@ -1,5 +1,4 @@
$('div[id^=flash_]').remove(); <%= render partial: 'body_trackers/flash' %>
$('#content').prepend('<%= j render_flash_messages %>');
<% if @measurement.destroyed? %> <% if @measurement.destroyed? %>
$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary').addBack().remove(); $('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary').addBack().remove();
<% end %> <% end %>

3
app/views/measurements/edit.js.erb
View File

@ -1,5 +1,4 @@
$('div[id^=flash_]').remove(); <%= render partial: 'body_trackers/flash' %>
$('#content').prepend('<%= j render_flash_messages %>');
$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary', ':not(.measurement)') $('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary', ':not(.measurement)')
.remove(); .remove();
$('tr[id=measurement-<%= @measurement.id %>]').nextAll('tr.primary').first() $('tr[id=measurement-<%= @measurement.id %>]').nextAll('tr.primary').first()

3
app/views/measurements/index.js.erb
View File

@ -1,5 +1,4 @@
$('div[id^=flash_]').remove(); <%= render partial: 'body_trackers/flash' %>
$('#content').prepend('<%= j render_flash_messages %>');
<% if defined? @quantities %> <% if defined? @quantities %>
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>'); $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
<% else %> <% else %>

3
app/views/measurements/new.js.erb
View File

@ -1,3 +1,2 @@
$('div[id^=flash_]').remove(); <%= render partial: 'body_trackers/flash' %>
$('#content').prepend('<%= j render_flash_messages %>');
$('#new-measurement').html('<%= j render partial: 'measurements/new_form' %>'); $('#new-measurement').html('<%= j render partial: 'measurements/new_form' %>');