text changes

iragm · Sep 17, 2024 · 3d16b09 · 3d16b09
1 parent 0777232
commit 3d16b09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/auctions/templates/auction_ribbon.html b/auctions/templates/auction_ribbon.html
@@ -37,7 +37,7 @@ <h3>{{auction}}</h3>
         <ul class="dropdown-menu">
           <a class="dropdown-item" href="/auctions/{{auction.slug}}/edit"><i class="bi bi-gear-fill"></i> Rules</a>
           <a class="dropdown-item" href="{{ auction.location_link }}"><i class="bi bi-geo-alt-fill"></i> Location{% if auction.location_qs|length > 1 %}s{% endif %}</a>
-          <a class="dropdown-item" href="{{ auction.set_lot_winners_link }}"><i class="bi bi-calendar-check"></i> Set lot winners</a>
+          {% if not auction.is_online %}<a class="dropdown-item" href="{{ auction.set_lot_winners_link }}"><i class="bi bi-calendar-check"></i> Set lot winners</a>{% endif %}
           <a class="dropdown-item" href="/auctions/{{auction.slug}}/chat/"><i class="bi bi-chat-fill"></i> Chat messages</a>
           <a class="dropdown-item" href='{% url "auction_help" slug=auction.slug %}'><i class="bi bi-question-circle-fill"></i> Help and Support</a>
           <a class="dropdown-item" href="/auctions/new?copy={{auction.slug}}"><i class="bi bi-plus-circle"></i> Copy to new auction</a>

diff --git a/auctions/templates/view_lot_images.html b/auctions/templates/view_lot_images.html
@@ -289,7 +289,7 @@ <h3>{{ lot.lot_name }}</h3>
             <tr>
                 <td><b>Distance from you:</b></td><td>{{ distance }} {% if lot.local_pickup %}<span class="badge text-dark bg-light">Local pickup available</span>{% endif %}
                     {% if request.user.userdata.location in lot.shipping_locations.all %}
-                    <span class="badge bg-light">Ships to {{ request.user.userdata.location }}</span>
+                    <span class="badge bg-light text-black">Ships to {{ request.user.userdata.location }}</span>
                     {% endif %}
                 </td>
             </tr>

diff --git a/auctions/views.py b/auctions/views.py
@@ -4518,7 +4518,13 @@ def dispatch(self, request, *args, **kwargs):
                         "You don't have any lots with printable labels in this auction.",
                     )
                 else:
-                    messages.error(request, "There aren't any lots with printable labels")
+                    if not self.auction.is_online:
+                        messages.error(request, "There aren't any lots with printable labels")
+                    else:
+                        messages.error(
+                            request,
+                            "No lots with printable labels.  Only lots with a winner will have a label generated for them.",
+                        )
                 return redirect(self.auction.get_absolute_url())
             return super().dispatch(request, *args, **kwargs)
         else: