Create second SeasonAdmin for Seat/Season relation, because if seat/s…

…eason is created at the same time than team/season, is bugged because is not possible to know if seat.team is present in season before save.

README.md

@@ -27,12 +27,14 @@ Versions
 ========
 - 0.14c (Fernando Alonso 14)
 - 0.16c (Race to Championship '16)
-- 0.17x
+- 0.19x
 - 0.27-VIL (Gilles Villeneuve 27)
 
-0.17x (in process)
+0.19x (in process)
 ==================
-Spanish translation
+- Spanish translation
+- Link to copy season copying teams and races to add_view. Seats is potentially bugged by team dependency (both would be create at the same time).
+- Fix bugs founded in previous versions.
 
 0.16
 ====

README.rst

@@ -28,12 +28,14 @@ Versions
 
 -  0.14c (Fernando Alonso 14)
 -  0.16c (Race to Championship '16)
--  0.17x
+-  0.19x
 -  0.27-VIL (Gilles Villeneuve 27)
 
-0.17x (in process)
-=================
+0.19x (in process)
+==================
 -  Spanish translation
+-  Link to copy season copying teams and races to add_view. Seats is potentially bugged by team dependency (both would be create at the same time).
+-  Fix bugs founded in previous versions.
 
 0.16
 ====

driver27/admin.py

@@ -9,13 +9,14 @@
 from tabbed_admin import TabbedModelAdmin
 
 from . import punctuation
-from .models import Contender, Seat, TeamSeason, SeatSeason
+from .models import Contender, Seat, TeamSeason, SeatSeason, SeatsSeason
 from .models import ContenderSeason
 from .models import Driver, Team, Competition, Circuit, Season, GrandPrix, Race, Result
 
 lr_diff = lambda l, r: list(set(l).difference(r))
 lr_intr = lambda l, r: list(set(l).intersection(r))
 
+
 # http://stackoverflow.com/a/34567383
 class AlwaysChangedModelForm(forms.ModelForm):
     def is_empty_form(self, *args, **kwargs):
@@ -62,7 +63,9 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
             elif db_field.name == 'grand_prix':
                 kwargs['queryset'] = GrandPrix.objects.filter(competitions__exact=request._obj_.competition)
             elif db_field.name == 'seat':
-                kwargs['queryset'] = Seat.objects.filter(contender__competition__exact=request._obj_.competition)
+                kwargs['queryset'] = Seat.objects.filter(
+                    contender__competition__exact=request._obj_.competition,
+                    team__seasons__exact=request._obj_)
         return super(CompetitionFilterInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
 
@@ -139,7 +142,7 @@ def __init__(self, *args, **kwargs):
 
 
 class SeatSeasonInline(CompetitionFilterInline):
-    model = Seat.seasons.through
+    model = SeatSeason
     ordering = ('seat',)
     formset = SeatSeasonFormSet
     form = AlwaysChangedModelForm
@@ -274,8 +277,7 @@ class Meta:
         fields = ('year', 'competition', 'rounds', 'punctuation')
 
 
-class SeasonAdmin(TabbedModelAdmin):
-    form = SeasonAdminForm
+class SeatSeasonAdmin(TabbedModelAdmin):
     tab_overview = (
         (None, {
         'fields': ('year', 'competition', 'rounds', 'punctuation')
@@ -287,13 +289,45 @@ class SeasonAdmin(TabbedModelAdmin):
     tab_drivers = (
         SeatSeasonInline,
     )
+    tabs = [
+        ('Overview', tab_overview),
+        ('Drivers', tab_drivers),
+    ]
+
+    readonly_fields = ('year', 'competition', 'rounds', 'punctuation')
+    list_filter = ('competition',)
+    list_display = ('competition', 'year',)
+
+    def has_add_permission(self, request):
+        return False
+
+    def get_form(self, request, obj=None, **kwargs):
+        # just save obj reference for future processing in Inline
+        if request and obj:
+            request._obj_ = obj
+        return super(SeatSeasonAdmin, self).get_form(request=request, obj=obj, **kwargs)
+
+
+class SeasonAdmin(TabbedModelAdmin):
+    form = SeasonAdminForm
+    tab_overview = (
+        (None, {
+        'fields': ('year', 'competition', 'rounds', 'punctuation')
+        }),
+    )
+    tab_teams = (
+        TeamSeasonInline,
+    )
+    # tab_drivers = (
+    #     SeatSeasonInline,
+    # )
     tab_races = (
         RaceInline,
     )
     tabs = [
         ('Overview', tab_overview),
         ('Teams', tab_teams),
-        ('Drivers', tab_drivers),
+        # ('Drivers', tab_drivers),
         ('Races', tab_races),
     ]
     readonly_fields = ('print_copy_season',)
@@ -550,3 +584,4 @@ def get_form(self, request, obj=None, **kwargs):
 
 # m2m admin
 admin.site.register(Contender, ContenderAdmin)
+admin.site.register(SeatsSeason, SeatSeasonAdmin)

driver27/models.py

@@ -124,7 +124,7 @@ def __str__(self):
 
     class Meta:
         unique_together = ('team', 'contender')
-        ordering = ['contender__driver__last_name', 'team']
+        ordering = ['current', 'contender__driver__last_name', 'team']
         verbose_name = _('Seat')
         verbose_name_plural = _('Seats')
 
@@ -268,6 +268,14 @@ class Meta:
         verbose_name_plural = _('Seasons')
 
 
+class SeatsSeason(Season):
+    # aux proxy class to use in Admin for Season/Seat relation from Season
+    class Meta:
+        proxy = True
+        verbose_name = _('Seats by season')
+        verbose_name_plural = _('Seats by season')
+
+
 @python_2_unicode_compatible
 class Race(models.Model):
     ALTER_PUNCTUATION = (

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-driver27',
-    version='0.17x',
+    version='0.19x',
     include_package_data=True,
     packages=find_packages(),
     url='https://github.com/SRJ9/django-driver27.git',