Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add merge migration

Roland Geiderb20f14fd7a1a
diff --git a/wger/exercises/migrations/0017_merge_20211126_1839.py b/wger/exercises/migrations/0017_merge_20211126_1839.py
new file mode 100644
index 000000000..6cea1023e
--- /dev/null
+++ b/wger/exercises/migrations/0017_merge_20211126_1839.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.9 on 2021-11-26 17:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('exercises', '0014_exerciseimage_style'),
+ ('exercises', '0016_auto_20210912_1231'),
+ ]
+
+ operations = [
+ ]
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 3a2c217b4..b9fe67b34 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -30,11 +30,6 @@
{# #}
{% block header %}
<link rel="stylesheet" type="text/css" href="{% static 'angular/styles.css' %}">
-
- <script src="{% static 'angular/runtime.js' %}" defer></script>
- <script src="{% static 'angular/polyfills.js' %}" defer></script>
- <script src="{% static 'angular/main.js' %}" defer></script>
-
{% endblock %}
@@ -42,7 +37,6 @@
{# Content #}
{# #}
{% block content %}
- <app-root></app-root>
{% if exercise.status == exercise.STATUS_PENDING %}
<div class="card text-white bg-dark mb-4">
<div class="card-header">
@@ -132,6 +126,8 @@
{% endwith %}
</div>
+
+{% endif %}
{% if perms.exercises.change_exerciseimage or perms.exercises.add_exerciseimage or user.userprofile.is_trustworthy %}
<p>
<a href="{% url 'exercise:image:add' exercise.id %}" >
@@ -139,7 +135,6 @@
</a>
</p>
{% endif %}
-{% endif %}
{% endwith %}
{% if perms.exercises.change_exerciseimage %}