Skip to content

Commit

Permalink
Maintain order of exercises when adding to supersets
Browse files Browse the repository at this point in the history
Fixes #229
  • Loading branch information
rolandgeider committed Nov 5, 2015
1 parent 1e64622 commit f1929f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions wger/core/static/js/workout-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ EXERCISE \
result_div = result_div.replace('EXERCISE', exercise.value);
result_div = result_div.replace('EXCERCISE-ID', exercise.id);

$(result_div).prependTo("#exercise-search-log");
$(result_div).appendTo("#exercise-search-log");
$("#exercise-search-log").scrollTop(0);
$('#exercise-search-log').trigger('create');
}
Expand All @@ -463,7 +463,7 @@ function get_exercise_formset(exercise_id) {
'/' + set_value + '/';

$.get(formset_url, function (data) {
$('#formsets').prepend(data);
$('#formsets').append(data);
$("#exercise-search-log").scrollTop(0);
$('#formsets').trigger("create");
});
Expand All @@ -483,7 +483,7 @@ function update_all_exercise_formset() {
'/' + set_value + '/';
$.get(formset_url, function (data) {
$('#formset-exercise-' + exercise_id).remove();
$('#formsets').prepend(data);
$('#formsets').append(data);
$('#exercise-search-log').scrollTop(0);
$('#formsets').trigger("create");
});
Expand Down
4 changes: 4 additions & 0 deletions wger/software/templates/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ <h4>2015-XX-XX</h4>
Fix problem with datepicker
<a href="https://github.com/rolandgeider/wger/issues/192">#192</a>
</li>
<li>
Order of exercises in supersets is not reverted anymore
<a href="https://github.com/rolandgeider/wger/issues/229">#229</a>
</li>
<li>
Docker images for easier installation
<a href="https://github.com/rolandgeider/wger/issues/181">#181</a>
Expand Down

0 comments on commit f1929f0

Please sign in to comment.