Self hosted FLOSS fitness/workout, nutrition and weight tracker
Protext repetition unit 2 "until failure"
Roland Geiderb2848203269c
diff --git a/wger/core/fixtures/setting_repetition_units.json b/wger/core/fixtures/setting_repetition_units.jsonindex b10347ffb..49090bf90 100644--- a/wger/core/fixtures/setting_repetition_units.json+++ b/wger/core/fixtures/setting_repetition_units.json@@ -9,35 +9,35 @@{"pk": 2,"fields": {- "name": "Seconds"+ "name": "Until Failure"},"model": "core.repetitionunit"},{"pk": 3,"fields": {- "name": "Minutes"+ "name": "Seconds"},"model": "core.repetitionunit"},{"pk": 4,"fields": {- "name": "Miles"+ "name": "Minutes"},"model": "core.repetitionunit"},{"pk": 5,"fields": {- "name": "Kilometers"+ "name": "Miles"},"model": "core.repetitionunit"},{"pk": 6,"fields": {- "name": "Until Failure"+ "name": "Kilometers"},"model": "core.repetitionunit"}diff --git a/wger/core/migrations/0009_auto_20160303_2340.py b/wger/core/migrations/0009_auto_20160303_2340.pyindex adf911770..d4866aa62 100644--- a/wger/core/migrations/0009_auto_20160303_2340.py+++ b/wger/core/migrations/0009_auto_20160303_2340.py@@ -12,19 +12,20 @@ def insert_data(apps, schema_editor):fixtures or perform any intermediate steps.'''WeightUnit = apps.get_model('core', 'WeightUnit')- WeightUnit(name='Kg').save()- WeightUnit(name='Lb').save()+ WeightUnit(name='kg').save()+ WeightUnit(name='lb').save()WeightUnit(name='Body Weight').save()WeightUnit(name='Plates').save()WeightUnit(name='Kilometers Per Hour').save()WeightUnit(name='Miles Per Hour').save()RepetitionUnit = apps.get_model('core', 'RepetitionUnit')- WeightUnit(name='Repetitions').save()- WeightUnit(name='Seconds').save()- WeightUnit(name='Minutes').save()- WeightUnit(name='Miles').save()- WeightUnit(name='Kilometers').save()+ RepetitionUnit(name='Repetitions').save()+ RepetitionUnit(name='Until Failure').save()+ RepetitionUnit(name='Seconds').save()+ RepetitionUnit(name='Minutes').save()+ RepetitionUnit(name='Miles').save()+ RepetitionUnit(name='Kilometers').save()class Migration(migrations.Migration):diff --git a/wger/core/templates/repetition_unit/list.html b/wger/core/templates/repetition_unit/list.htmlindex 4e39b7907..52b73b17d 100644--- a/wger/core/templates/repetition_unit/list.html+++ b/wger/core/templates/repetition_unit/list.html@@ -8,7 +8,7 @@<ul class="list-group">{% for unit in object_list %}<li class="list-group-item ">- {% if unit.id != 1 %}+ {% if unit.id != 1 and unit.id != 2 %}<div class="btn-group pull-right"><button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown"><span class="glyphicon glyphicon-cog"></span>