Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

removed extra migrations and added minor change to exercise view html file

ryowrightd66cea81d5b6
diff --git a/wger/exercises/migrations/0006_auto_20201201_0653.py b/wger/exercises/migrations/0006_auto_20201201_0653.py
deleted file mode 100644
index deea27ca1..000000000
--- a/wger/exercises/migrations/0006_auto_20201201_0653.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 05:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0005_auto_20190618_1617'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='ExerciseVariation',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=50, verbose_name='Variation')),
- ],
- options={
- 'ordering': ['name'],
- },
- ),
- migrations.AddField(
- model_name='exercise',
- name='variation',
- field=models.ManyToManyField(blank=True, to='exercises.ExerciseVariation', verbose_name='Variation'),
- ),
- ]
diff --git a/wger/exercises/migrations/0013_auto_20201202_0043.py b/wger/exercises/migrations/0006_exercise_variations.py
similarity index 63%
rename from wger/exercises/migrations/0013_auto_20201202_0043.py
rename to wger/exercises/migrations/0006_exercise_variations.py
index 02beb04bf..48022a5c7 100644
--- a/wger/exercises/migrations/0013_auto_20201202_0043.py
+++ b/wger/exercises/migrations/0006_exercise_variations.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.3 on 2020-12-01 23:43
+# Generated by Django 3.1.3 on 2020-12-02 22:11
from django.db import migrations, models
@@ -6,14 +6,11 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('exercises', '0012_auto_20201201_1258'),
+ ('exercises', '0005_auto_20190618_1617'),
]
operations = [
- migrations.DeleteModel(
- name='ExerciseVariation',
- ),
- migrations.AlterField(
+ migrations.AddField(
model_name='exercise',
name='variations',
field=models.ManyToManyField(blank=True, related_name='_exercise_variations_+', to='exercises.Exercise', verbose_name='Variations'),
diff --git a/wger/exercises/migrations/0007_auto_20201201_0714.py b/wger/exercises/migrations/0007_auto_20201201_0714.py
deleted file mode 100644
index 936e6dcf4..000000000
--- a/wger/exercises/migrations/0007_auto_20201201_0714.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 06:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0006_auto_20201201_0653'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='exercisevariation',
- name='name',
- field=models.CharField(max_length=50, verbose_name='Name'),
- ),
- ]
diff --git a/wger/exercises/migrations/0008_auto_20201201_1219.py b/wger/exercises/migrations/0008_auto_20201201_1219.py
deleted file mode 100644
index 61fe8c4c3..000000000
--- a/wger/exercises/migrations/0008_auto_20201201_1219.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 11:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0007_auto_20201201_0714'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='exercise',
- name='variation',
- ),
- migrations.DeleteModel(
- name='ExerciseVariation',
- ),
- ]
diff --git a/wger/exercises/migrations/0009_auto_20201201_1220.py b/wger/exercises/migrations/0009_auto_20201201_1220.py
deleted file mode 100644
index d9bcf7a6d..000000000
--- a/wger/exercises/migrations/0009_auto_20201201_1220.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 11:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0008_auto_20201201_1219'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='ExerciseVariation',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=50, verbose_name='Name')),
- ],
- options={
- 'ordering': ['name'],
- },
- ),
- migrations.AddField(
- model_name='exercise',
- name='variation',
- field=models.ManyToManyField(blank=True, to='exercises.ExerciseVariation', verbose_name='Variation'),
- ),
- ]
diff --git a/wger/exercises/migrations/0010_auto_20201201_1223.py b/wger/exercises/migrations/0010_auto_20201201_1223.py
deleted file mode 100644
index e7f143b46..000000000
--- a/wger/exercises/migrations/0010_auto_20201201_1223.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 11:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0009_auto_20201201_1220'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='exercise',
- name='variation',
- ),
- migrations.DeleteModel(
- name='ExerciseVariation',
- ),
- ]
diff --git a/wger/exercises/migrations/0011_auto_20201201_1224.py b/wger/exercises/migrations/0011_auto_20201201_1224.py
deleted file mode 100644
index 0ecc0e30f..000000000
--- a/wger/exercises/migrations/0011_auto_20201201_1224.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 11:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0010_auto_20201201_1223'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='ExerciseVariation',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=50, verbose_name='Name')),
- ],
- options={
- 'ordering': ['name'],
- },
- ),
- migrations.AddField(
- model_name='exercise',
- name='variation',
- field=models.ManyToManyField(blank=True, to='exercises.ExerciseVariation', verbose_name='Variation'),
- ),
- ]
diff --git a/wger/exercises/migrations/0012_auto_20201201_1258.py b/wger/exercises/migrations/0012_auto_20201201_1258.py
deleted file mode 100644
index 5593dd78f..000000000
--- a/wger/exercises/migrations/0012_auto_20201201_1258.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 3.1.3 on 2020-12-01 11:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('exercises', '0011_auto_20201201_1224'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='exercise',
- name='variation',
- ),
- migrations.AddField(
- model_name='exercise',
- name='variations',
- field=models.ManyToManyField(blank=True, to='exercises.ExerciseVariation', verbose_name='Variations'),
- ),
- ]
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index bb5bfbcba..a3f180e73 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -253,17 +253,15 @@ $(document).ready(function() {
{% render_weight_log logs svg_uuid user %}
{% endif %}
-<h5 class="mt-4">{% trans "Exercise Variations" %}:</h5>
{% if exercise.variations %}
- <ul>
- {% for variation in exercise.variations.all %}
- <li>
- <a href="{{ variation.get_absolute_url }}">{{ variation }}</a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <p>{% trans "None" %}</p>
+ <h5 class="mt-4">{% trans "Exercise Variations" %}:</h5>
+ <ul>
+ {% for variation in exercise.variations.all %}
+ <li>
+ <a href="{{ variation.get_absolute_url }}">{{ variation }}</a>
+ </li>
+ {% endfor %}
+ </ul>
{% endif %}
{% endblock %}