Merge pull request #321 from iragm/march-2025-fixes

Restore CSV import and small tweaks

Author: iragm

auctions/forms.py

@@ -2102,29 +2102,25 @@ def __init__(self, *args, **kwargs):
             #    self.fields['species_search'].initial = self.instance.species.common_name.split(",")[0]
         else:
             if self.cloned_from:
-                try:
-                    cloneLot = Lot.objects.get(pk=self.cloned_from, is_deleted=False)
-                    if (cloneLot.user.pk == self.user.pk) or self.user.is_superuser:
-                        # you can only clone your lots
-                        cloneFields = [
-                            "lot_name",
-                            "quantity",
-                            "species_category",
-                            # "description",
-                            "summernote_description",
-                            "i_bred_this_fish",
-                            "reserve_price",
-                            "buy_now_price",
-                            "reference_link",
-                            "donation",
-                            "custom_checkbox",
-                            "custom_field_1",
-                        ]
-                        for field in cloneFields:
-                            self.fields[field].initial = getattr(cloneLot, field)
-                        self.fields["cloned_from"].initial = int(self.cloned_from)
-                except:
-                    pass
+                clone_from_lot = Lot.objects.filter(pk=self.cloned_from, is_deleted=False).first()
+                if clone_from_lot and ((clone_from_lot.user.pk == self.user.pk) or self.user.is_superuser):
+                    # you can only clone your lots
+                    cloneFields = [
+                        "lot_name",
+                        "quantity",
+                        "species_category",
+                        "summernote_description",
+                        "i_bred_this_fish",
+                        "reserve_price",
+                        "buy_now_price",
+                        "reference_link",
+                        "donation",
+                        "custom_checkbox",
+                        "custom_field_1",
+                    ]
+                    for field in cloneFields:
+                        self.fields[field].initial = getattr(clone_from_lot, field)
+                    self.fields["cloned_from"].initial = int(self.cloned_from)
             # default to making new lots part of a club auction
             self.fields["part_of_auction"].initial = "True"
             self.fields["run_duration"].initial = 10

auctions/templates/auction_ribbon.html

@@ -27,7 +27,7 @@ <h3>{{auction}}</h3>
       <a class="nav-link {% if active_tab == 'main'%}active{% endif %}" href="/auctions/{{auction.slug}}/"><i class="bi bi-house-fill"></i><span class='d-none d-md-inline'> Main</span></a>
     </li>
     <li class="nav-item">
-      <a class="nav-link {% if active_tab == 'users'%}active{% endif %}" href="/auctions/{{auction.slug}}/users"><i class="bi bi-people-fill"></i><span class='d-none d-md-inline'> Users</span></a>
+      <a class="nav-link {% if active_tab == 'users'%}active{% endif %}" href='{% url "auction_tos_list" slug=auction.slug %}'><i class="bi bi-people-fill"></i><span class='d-none d-md-inline'> Users</span></a>
     </li>
     <li class="nav-item">
       <a class="nav-link {% if active_tab == 'lots'%}active{% endif %}" href="/auctions/{{auction.slug}}/lots"><i class="bi bi-calendar"></i><span class='d-none d-md-inline'> Lots</span></a>

auctions/templates/base.html

@@ -302,7 +302,7 @@
                     <div class="dropdown-menu">
                     <a class="dropdown-item" href="{% url 'admin_dashboard' %}">User stats</a>
                     <a class="dropdown-item" href="{% url 'admin_user_map' %}?view=recent&filter=24">User map</a>
-                    <a class="dropdown-item" href="{% url 'admin_traffic' %}">Traffic</a>
+                    <a class="dropdown-item" href="{% url 'admin_traffic' %}?days=30">Traffic</a>
                     <a class="dropdown-item" href="{% url 'admin_referrers' %}?days=30">Referrers</a>
                     <a class="dropdown-item" href="/admin/auth/user/?o=-5">Admin site</a>
                     <a class="dropdown-item" href="{% url 'admin_error' %}">Test error messages</a>

auctions/templates/lot_form.html

@@ -13,7 +13,7 @@
 
 function setAuction(setting) {
     if (setting) {
-        $('#div_id_auction').closest('.col-md-3').show();
+        $('#div_id_auction').closest('.col-md-8').show();
         $('#div_id_donation').closest('.col-md-3').show();
         $('#div_id_relist_if_not_sold').closest('.mb-3').hide();
         $('#div_id_relist_if_sold').closest('.mb-3').hide();
@@ -25,7 +25,7 @@
         setAuctionRequiredFields($('#id_auction').val())
     } else {
         // fields for non-auction lots
-        $('#div_id_auction').closest('.col-md-3').hide();
+        $('#div_id_auction').closest('.col-md-8').hide();
         $('#div_id_donation').closest('.col-md-3').hide();
         //$('#div_id_promoted').closest('.col-md-3').show();
         $('#div_id_relist_if_not_sold').closest('.mb-3').show();