Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Another htmx fix

Roland Geiderb0274709992d
diff --git a/wger/gallery/models/image.py b/wger/gallery/models/image.py
index bcafd2920..cca02d53b 100644
--- a/wger/gallery/models/image.py
+++ b/wger/gallery/models/image.py
@@ -67,6 +67,12 @@ class Image(models.Model):
blank=True,
)
+ def __str__(self):
+ """
+ Return a more human-readable representation
+ """
+ return f'Gallery image #{self.pk}'
+
def get_owner_object(self):
"""
Returns the object that has owner information
diff --git a/wger/gallery/templates/images/overview.html b/wger/gallery/templates/images/overview.html
index 2355d5ea0..631b7ab32 100644
--- a/wger/gallery/templates/images/overview.html
+++ b/wger/gallery/templates/images/overview.html
@@ -15,13 +15,14 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">{{ image.date }}</h5>
- <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+ <button type="button" class="close" data-bs-dismiss="modal"
+ aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<a href="{{ image.image.url }}">
- <img src="{{ image.image.url }}" class="img-fluid">
+ <img src="{{ image.image.url }}" class="img-fluid" alt="">
</a>
{% if image.description %}
<p> {{ image.description }}</p>
@@ -29,10 +30,18 @@
</div>
<div class="modal-footer">
- <a href="{% url 'gallery:images:delete' image.id %}"
- class="btn btn-primary">
+ {% url 'gallery:images:delete' image.id as url %}
+ <a
+ href="{{ url }}"
+ class="btn btn-primary"
+ hx-get="{{ url }}"
+ hx-target="#ajax-info-content"
+ data-bs-toggle="modal"
+ data-bs-target="#wger-ajax-info"
+ >
<span class="{% fa_class 'trash' %}"></span>
</a>
+
<a href="{% url 'gallery:images:edit' image.id %}" class="btn btn-primary">
<span class="{% fa_class 'edit' %}"></span>
</a>
@@ -47,7 +56,8 @@
<div class="col-sm-6 col-lg-4 mb-4">
<div class="card">
<a href="#" data-bs-toggle="modal" data-bs-target="#modalImage{{ image.id }}">
- <img class="card-img-top" src="{{ image.image.url }}" alt="{{ image.description }}">
+ <img class="card-img-top" src="{{ image.image.url }}"
+ alt="{{ image.description }}">
</a>
</div>
</div>
diff --git a/wger/gallery/views/images.py b/wger/gallery/views/images.py
index 087aae60d..045fb074d 100644
--- a/wger/gallery/views/images.py
+++ b/wger/gallery/views/images.py
@@ -61,6 +61,7 @@ class ImageAddView(WgerFormMixin, CreateView):
model = Image
form_class = ImageForm
title = _('Add')
+ template_name = 'form_content.html'
def get_initial(self):
"""
@@ -92,6 +93,7 @@ class ImageUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
model = Image
form_class = ImageForm
+ template_name = 'form_content.html'
def get_context_data(self, **kwargs):
context = super(ImageUpdateView, self).get_context_data(**kwargs)