fix migrations

ephios-dev · Mar 3, 2025 · a30d7ba · a30d7ba
1 parent 4683f2d
commit a30d7ba
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/...e/migrations/0034_participationcomment.py → ...e/migrations/0035_participationcomment.py b/...e/migrations/0034_participationcomment.py → ...e/migrations/0035_participationcomment.py
@@ -31,7 +31,7 @@ def revert_comments(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("core", "0033_eventtype_show_participant_data"),
+        ("core", "0034_alter_eventtype_show_participant_data"),
     ]
 
     operations = [
@@ -68,7 +68,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created_at",
-                    models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+                    models.DateTimeField(auto_now_add=True),
                 ),
                 (
                     "participation",

diff --git a/...5_remove_abstractparticipation_comment.py → ...6_remove_abstractparticipation_comment.py b/...5_remove_abstractparticipation_comment.py → ...6_remove_abstractparticipation_comment.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("core", "0034_participationcomment"),
+        ("core", "0035_participationcomment"),
     ]
 
     operations = [

diff --git a/ephios/core/templates/core/disposition/fragment_participation.html b/ephios/core/templates/core/disposition/fragment_participation.html
@@ -63,14 +63,18 @@ <h6 class="d-inline">
                 {% if form.previous_comments %}
                     {{ form.previous_comments|as_crispy_field }}
                 {% endif %}
-                <div class="form-row">
-                  <div class="form-group col-md-10">
+                <div class="row">
+                  <div class="form-group col">
                     {{ form.comment|as_crispy_field }}
                   </div>
-                  <div class="form-group col-md-2">
-                    <input type="checkbox" class="btn-check" id="{{ form.comment_is_internal.auto_id }}" name="{{ form.comment_is_internal.html_name }}" checked autocomplete="off">
-                    <label class="btn btn-secondary" for="btn-check-2"><span class="fa fa-eye-slash"></span></label>
+                  <div class="form-group col-md-2 pt-4">
+                    <input type="checkbox" class="btn-check" id="{{ form.comment_is_internal.auto_id }}" name="{{ form.comment_is_internal.html_name }}" autocomplete="off">
+                    <label class="btn btn-outline-primary" for="{{ form.comment_is_internal.auto_id }}"><span class="fa fa-eye-slash"></span></label>
                   </div>
+{#                    <div class="form-group col">#}
+{#                        <label class="form-label" for="flexSwitchCheckDefault">{{ form.comment_is_internal.label }}</label><br />#}
+{#                      <input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault">#}
+{#                    </div>#}
                 </div>
                 {% block participation_form %}
                 {% endblock %}

diff --git a/.../plugins/baseshiftstructures/templates/baseshiftstructures/participation_card_inline.html b/.../plugins/baseshiftstructures/templates/baseshiftstructures/participation_card_inline.html
@@ -21,7 +21,10 @@
                 {% if show_comments or comment.visible_for == 2 or participation == own_participation %}
                     <div class="mb-3">
                         <i class="fas fa-comment"></i>
-                        <span>{{ comment.text }}</span>
+                        <div>
+                            <span><b>{{ comment.author }}</b></span>
+                            <span>{{ comment.text }}</span>
+                        </div>
                     </div>
                 {% endif %}
             {% endfor %}