django-tabbed-admin3 3.0.0__tar.gz → 3.2.0__tar.gz

{django-tabbed-admin3-3.0.0 → django_tabbed_admin3-3.2.0}/MANIFEST.in

@@ -3,3 +3,4 @@ include LICENSE.txt
 include README.rst
 recursive-include tabbed_admin/static *
 recursive-include tabbed_admin/templates *
+prune tabbed_admin_exemple

{django-tabbed-admin3-3.0.0 → django_tabbed_admin3-3.2.0}/PKG-INFO

@@ -1,28 +1,49 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-tabbed-admin3
-Version: 3.0.0
-Summary: Easily add tabs to django admin forms.
-Author: Michael Galler
-Author-email: mgaller@live.de
-License: BSD License
-Platform: OS Independent
+Version: 3.2.0
+Summary: Easily add tabs to django admin forms. Django 6.1 compatible fork.
+Author: Guillaume Pousseo (original), Michael Galler (django 4 fork)
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://github.com/mgaller/django-tabbed-admin3
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.txt
+Requires-Dist: django>=4.2
+Dynamic: license-file
 
 ###################
 Django tabbed admin
 ###################
 
-This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with Django 4.x fix.
+This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with compatibility updates for modern Django versions.
+
+Version 3.2 adds Django 6.1 support while retaining jQuery UI and the existing
+``TABBED_ADMIN_*`` settings. Tests cover Django 4.2, 5.0, 5.1, 5.2, 6.0 and 6.1.
+The change-form template now inherits Django's form controls, actions and popup
+fields instead of copying them. Projects overriding
+``tabbed_admin/change_form.html`` must update their override to use this fix.
+For integration with another admin extension, ``TabbedModelAdmin.tabbed_admin_base_template``
+can specify a parent template instead of ``admin/change_form.html``.
+The ``tabbed_admin_base_template`` context variable takes precedence over this
+attribute, allowing other admin extensions to supply the parent template.
 
 
 Simple library to easilly add tabs to admin forms. It also allows users to re-order inlines and fieldsets.
@@ -198,6 +219,8 @@ Contribution
 Please feel free to contribute. Any help and advices are much appreciated.
 You will find an example application to run and develop the library easily.
 
+Run the standalone test suite with ``PYTHONPATH=. python tabbed_admin/tests/runtests.py``.
+
 
 *****
 LINKS

django-tabbed-admin3-3.0.0/django_tabbed_admin3.egg-info/PKG-INFO → django_tabbed_admin3-3.2.0/README.rst

@@ -1,28 +1,18 @@
-Metadata-Version: 2.1
-Name: django-tabbed-admin3
-Version: 3.0.0
-Summary: Easily add tabs to django admin forms.
-Author: Michael Galler
-Author-email: mgaller@live.de
-License: BSD License
-Platform: OS Independent
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
-License-File: LICENSE.txt
-License-File: AUTHORS.txt
-
 ###################
 Django tabbed admin
 ###################
 
-This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with Django 4.x fix.
+This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with compatibility updates for modern Django versions.
+
+Version 3.2 adds Django 6.1 support while retaining jQuery UI and the existing
+``TABBED_ADMIN_*`` settings. Tests cover Django 4.2, 5.0, 5.1, 5.2, 6.0 and 6.1.
+The change-form template now inherits Django's form controls, actions and popup
+fields instead of copying them. Projects overriding
+``tabbed_admin/change_form.html`` must update their override to use this fix.
+For integration with another admin extension, ``TabbedModelAdmin.tabbed_admin_base_template``
+can specify a parent template instead of ``admin/change_form.html``.
+The ``tabbed_admin_base_template`` context variable takes precedence over this
+attribute, allowing other admin extensions to supply the parent template.
 
 
 Simple library to easilly add tabs to admin forms. It also allows users to re-order inlines and fieldsets.
@@ -198,6 +188,8 @@ Contribution
 Please feel free to contribute. Any help and advices are much appreciated.
 You will find an example application to run and develop the library easily.
 
+Run the standalone test suite with ``PYTHONPATH=. python tabbed_admin/tests/runtests.py``.
+
 
 *****
 LINKS

django-tabbed-admin3-3.0.0/README.rst → django_tabbed_admin3-3.2.0/django_tabbed_admin3.egg-info/PKG-INFO

@@ -1,8 +1,49 @@
+Metadata-Version: 2.4
+Name: django-tabbed-admin3
+Version: 3.2.0
+Summary: Easily add tabs to django admin forms. Django 6.1 compatible fork.
+Author: Guillaume Pousseo (original), Michael Galler (django 4 fork)
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://github.com/mgaller/django-tabbed-admin3
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+License-File: AUTHORS.txt
+Requires-Dist: django>=4.2
+Dynamic: license-file
+
 ###################
 Django tabbed admin
 ###################
 
-This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with Django 4.x fix.
+This is a simple fork of django-tabbed-admin https://github.com/omji/django-tabbed-admin with compatibility updates for modern Django versions.
+
+Version 3.2 adds Django 6.1 support while retaining jQuery UI and the existing
+``TABBED_ADMIN_*`` settings. Tests cover Django 4.2, 5.0, 5.1, 5.2, 6.0 and 6.1.
+The change-form template now inherits Django's form controls, actions and popup
+fields instead of copying them. Projects overriding
+``tabbed_admin/change_form.html`` must update their override to use this fix.
+For integration with another admin extension, ``TabbedModelAdmin.tabbed_admin_base_template``
+can specify a parent template instead of ``admin/change_form.html``.
+The ``tabbed_admin_base_template`` context variable takes precedence over this
+attribute, allowing other admin extensions to supply the parent template.
 
 
 Simple library to easilly add tabs to admin forms. It also allows users to re-order inlines and fieldsets.
@@ -178,6 +219,8 @@ Contribution
 Please feel free to contribute. Any help and advices are much appreciated.
 You will find an example application to run and develop the library easily.
 
+Run the standalone test suite with ``PYTHONPATH=. python tabbed_admin/tests/runtests.py``.
+
 
 *****
 LINKS

{django-tabbed-admin3-3.0.0 → django_tabbed_admin3-3.2.0}/django_tabbed_admin3.egg-info/SOURCES.txt

@@ -2,11 +2,11 @@ AUTHORS.txt
 LICENSE.txt
 MANIFEST.in
 README.rst
-setup.cfg
-setup.py
+pyproject.toml
 django_tabbed_admin3.egg-info/PKG-INFO
 django_tabbed_admin3.egg-info/SOURCES.txt
 django_tabbed_admin3.egg-info/dependency_links.txt
+django_tabbed_admin3.egg-info/requires.txt
 django_tabbed_admin3.egg-info/top_level.txt
 tabbed_admin/__init__.py
 tabbed_admin/admin.py

django_tabbed_admin3-3.2.0/django_tabbed_admin3.egg-info/requires.txt

@@ -0,0 +1 @@
+django>=4.2

django_tabbed_admin3-3.2.0/pyproject.toml

@@ -0,0 +1,57 @@
+[build-system]
+requires = ["setuptools>=77.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "django-tabbed-admin3"
+version = "3.2.0"
+description = "Easily add tabs to django admin forms. Django 6.1 compatible fork."
+readme = "README.rst"
+license = "BSD-3-Clause"
+license-files = ["LICENSE.txt", "AUTHORS.txt"]
+authors = [
+    {name = "Guillaume Pousseo (original)"},
+    {name = "Michael Galler (django 4 fork)"},
+]
+requires-python = ">=3.10"
+dependencies = ["django>=4.2"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.1",
+    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
+    "Framework :: Django :: 6.1",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+
+[project.urls]
+Homepage = "https://github.com/mgaller/django-tabbed-admin3"
+
+[tool.setuptools.packages.find]
+include = ["tabbed_admin*"]
+namespaces = false
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.package-data]
+tabbed_admin = ["templates/**/*.html", "static/**/*.css", "static/**/*.js", "static/**/*.png"]
+
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+ignore = ["E501"]

django_tabbed_admin3-3.2.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

django_tabbed_admin3-3.2.0/tabbed_admin/__init__.py

@@ -0,0 +1,3 @@
+from .admin import TabbedModelAdmin
+
+__all__ = ["TabbedModelAdmin"]

django_tabbed_admin3-3.2.0/tabbed_admin/admin.py

@@ -0,0 +1,141 @@
+from django.conf import settings
+from django.contrib.admin.options import ModelAdmin
+from django.utils.translation import gettext_lazy as _
+
+from .settings import JQUERY_UI_CSS, JQUERY_UI_JS, USE_JQUERY_UI
+
+
+class TabbedModelAdmin(ModelAdmin):
+    tabs = None
+    formatted_tabs = {}
+
+    # Needs a specific template to display the tabs
+    change_form_template = "tabbed_admin/change_form.html"
+    tabbed_admin_base_template = "admin/change_form.html"
+
+    def get_fieldsets(self, request, obj=None):
+        """
+        Overwrites BaseModelAdmin fieldsets to add fieldsets passed by the
+        tabs.
+        If the tabs attribute is not set, use the default ModelAdmin method.
+        """
+        tabs_fieldsets = self.get_formatted_tabs(request, obj)["fieldsets"]
+        if self.tabs is not None:
+            self.fieldsets = ()
+        self.fieldsets = self.add_tabbed_item(tabs_fieldsets, self.fieldsets)
+        return super().get_fieldsets(request, obj)
+
+    def get_inline_instances(self, request, obj=None):
+        """
+        Overwrites BaseModelAdmin inline_instances to add inlines passed by
+        the tabs.
+        If the tabs attribute is not set, use the default ModelAdmin method.
+        """
+        if self.tabs is not None:
+            self.inlines = ()
+        tabs_inlines = self.get_formatted_tabs(request, obj)["inlines"]
+        self.inlines = self.add_tabbed_item(tabs_inlines, self.inlines)
+        return super().get_inline_instances(request, obj)
+
+    def add_tabbed_item(self, items_to_add, collection):
+        """
+        Adds tabbed items (inlines or fieldsets) to their corresponding
+        attribute.
+        """
+        if items_to_add:
+            for item in items_to_add:
+                if item not in collection:
+                    if isinstance(collection, tuple):
+                        collection = collection + (item,)
+                    elif isinstance(collection, list):
+                        collection.append(item)
+        return collection
+
+    def get_tabs(self, request, obj=None):
+        """
+        Returns the tabs attribute.
+        """
+        return self.tabs
+
+    def get_formatted_tabs(self, request, obj=None):
+        """
+        Returns the formatted tabs attribute.
+        """
+        if self.tabs:
+            self.parse_fieldsets_inlines_from_tabs(request, obj)
+        else:
+            self.formatted_tabs = {"fields": [], "fieldsets": (), "inlines": ()}
+        return self.formatted_tabs
+
+    def parse_fieldsets_inlines_from_tabs(self, request, obj=None):
+        """
+        Parses the self.tabs attribute. Checks its integrity and populates
+        self._tabs_fieldsets and self._tabs_inlines attributes.
+        """
+        tabs_fieldsets = ()
+        tabs_inlines = ()
+        self.formatted_tabs = {"fields": []}
+        for tab in self.get_tabs(request, obj):
+            # Checks that each tab is formatted with 2 arguments: verbose name
+            # of the tab and the tab configuration.
+            if not isinstance(tab, (tuple, list)):
+                raise TypeError(_("Each tab entry must be either a list or a tuple"))
+            if len(tab) != 2:
+                raise ValueError(_("Each tabs entry must contain 2 arguments: a verbose name and the tab setup."))
+            if not isinstance(tab[1], (tuple, list)):
+                raise TypeError(_("A tab definition must be either a list or a tuple"))
+            # Parse the tab configuration: if an entry is a tuple or a list
+            # it's a fieldset, otherwise it's an inline class.
+            formatted_tab = {"name": tab[0], "entries": []}
+            for tab_entry in tab[1]:
+                if isinstance(tab_entry, (tuple, list)):
+                    tabs_fieldsets = tabs_fieldsets + (tab_entry,)
+                    formatted_tab_entry = {
+                        "type": "fieldset",
+                        "name": tab_entry[0],
+                        "config": tab_entry[1],
+                        "index": len(tabs_fieldsets) - 1,
+                    }
+                else:
+                    tabs_inlines = tabs_inlines + (tab_entry,)
+                    formatted_tab_entry = {
+                        "type": "inline",
+                        "name": tab_entry.__name__,
+                    }
+                formatted_tab["entries"].append(formatted_tab_entry)
+            self.formatted_tabs["fields"].append(formatted_tab)
+        self.formatted_tabs["fieldsets"] = tabs_fieldsets
+        self.formatted_tabs["inlines"] = tabs_inlines
+
+    def render_change_form(self, request, context, add=False, change=False, form_url="", obj=None):
+        context = {
+            **context,
+            "tabs": self.get_formatted_tabs(request, obj),
+            "tabbed_admin_base_template": context.get("tabbed_admin_base_template", self.tabbed_admin_base_template),
+        }
+        return super().render_change_form(
+            request,
+            context,
+            add=add,
+            change=change,
+            form_url=form_url,
+            obj=obj,
+        )
+
+    class Media:
+        """
+        Extends media class to add custom jquery ui if
+        TABBED_ADMIN_USE_JQUERY_UI is set to True.
+        """
+
+        if "grappelli" in settings.INSTALLED_APPS:
+            css = {"all": ("tabbed_admin/css/tabbed_grappelli_admin.css",)}
+
+        if USE_JQUERY_UI:
+            css = {
+                "all": (
+                    JQUERY_UI_CSS,
+                    "tabbed_admin/css/tabbed_admin.css",
+                )
+            }
+            js = (JQUERY_UI_JS,)

django_tabbed_admin3-3.2.0/tabbed_admin/settings.py

@@ -0,0 +1,12 @@
+from django.conf import settings
+
+# Activate the library jquery ui
+USE_JQUERY_UI = getattr(settings, "TABBED_ADMIN_USE_JQUERY_UI", False)
+
+# Default jquery ui css and js
+DEFAULT_JQUERY_UI_CSS = "tabbed_admin/css/jquery-ui-1.11.4.min.css"
+DEFAULT_JQUERY_UI_JS = "tabbed_admin/js/jquery-ui-1.11.4.min.js"
+
+# User ability to override the default css and js
+JQUERY_UI_CSS = getattr(settings, "TABBED_ADMIN_JQUERY_UI_CSS", DEFAULT_JQUERY_UI_CSS)
+JQUERY_UI_JS = getattr(settings, "TABBED_ADMIN_JQUERY_UI_JS", DEFAULT_JQUERY_UI_JS)

django_tabbed_admin3-3.2.0/tabbed_admin/templates/tabbed_admin/change_form.html

@@ -0,0 +1,65 @@
+{% extends tabbed_admin_base_template|default:"admin/change_form.html" %}
+{% load tabbed_admin_tags %}
+
+{% block field_sets %}
+  {% if tabs.fields %}
+    <div id="tabs">
+      <ul>
+        {% for tab in tabs.fields %}
+          <li><a href="#tabs-{{ forloop.counter }}" id="for_tabs-{{ forloop.counter }}">{{ tab.name }}</a></li>
+        {% endfor %}
+      </ul>
+      {% for tab in tabs.fields %}
+        <div id="tabs-{{ forloop.counter }}" class="{{ tab.name }}">
+          {% for entry in tab.entries %}
+            {% render_tab_fieldsets_inlines entry %}
+          {% endfor %}
+        </div>
+      {% endfor %}
+    </div>
+    <script{% if csp_nonce %} nonce="{{ csp_nonce }}"{% endif %}>
+      (function($) {
+        $('#tabs').tabs({
+          {% if add %}active: false{% endif %}
+        });
+
+        const enabled_tabs = [];
+        const disabled_tabs = [];
+        {% for tab in page_config %}
+          {% if tab.enabled %}
+            enabled_tabs.push({{ forloop.counter0 }});
+          {% else %}
+            disabled_tabs.push({{ forloop.counter0 }});
+          {% endif %}
+        {% endfor %}
+        for (let i = 0; i < disabled_tabs.length; i++) {
+          $('#tabs').tabs('disable', disabled_tabs[i]);
+        }
+        {% if add %}
+          $('#tabs').tabs('option', 'active', enabled_tabs.length ? enabled_tabs[0] : {% if page_config %}false{% else %}0{% endif %});
+        {% endif %}
+
+        $('#tabs > div').each(function() {
+          if ($(this).find('.errorlist').length) {
+            $('#tabs #for_' + this.id).addClass('errortab');
+          }
+        });
+        $('#tabs').on('tabsactivate', function(event, ui) {
+          const scrollPos = $(window).scrollTop();
+          const hash = ui.newTab.find('a').attr('href');
+          if (hash) window.location.hash = hash;
+          $(window).scrollTop(scrollPos);
+        });
+        if ($('.errornote').length) {
+          $('.errornote').addClass('tabbed-errornote');
+        }
+      })(django.jQuery);
+    </script>
+  {% else %}
+    {{ block.super }}
+  {% endif %}
+{% endblock %}
+
+{% block inline_field_sets %}
+  {% if not tabs.fields %}{{ block.super }}{% endif %}
+{% endblock %}

django_tabbed_admin3-3.2.0/tabbed_admin/templatetags/tabbed_admin_tags.py

@@ -0,0 +1,58 @@
+from django import template
+from django.contrib.admin.helpers import Fieldset
+from django.core.exceptions import ImproperlyConfigured
+from django.template.loader import render_to_string
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def render_tab_fieldsets_inlines(context, entry):
+    """
+    Render the fieldsets and inlines for a tab.
+    """
+    fieldset_template = "admin/includes/fieldset.html"
+    admin_form = context["adminform"]
+    if "request" not in context:
+        raise ImproperlyConfigured(
+            '"request" missing from context. Add '
+            '"django.template.context_processors.request" to your '
+            "TEMPLATES context_processors setting."
+        )
+    request = context["request"]
+    readonly_fields = admin_form.readonly_fields
+    values = context.flatten()
+    inline_matching = {}
+    if "inline_admin_formsets" in context:
+        inline_matching = {inline.opts.__class__.__name__: inline for inline in context["inline_admin_formsets"]}
+
+    if entry["type"] == "fieldset":
+        name = entry["name"]
+        f = Fieldset(
+            admin_form.form,
+            name,
+            readonly_fields=readonly_fields,
+            model_admin=admin_form.model_admin,
+            **entry["config"],
+        )
+        values.update(
+            fieldset=f,
+            heading_level=2,
+            prefix="fieldset",
+            id_prefix=0,
+            id_suffix=entry.get("index", 0),
+        )
+        return render_to_string(fieldset_template, values, request=request)
+    elif entry["type"] == "inline":
+        try:
+            inline_admin_formset = inline_matching[entry["name"]]
+            values["inline_admin_formset"] = inline_admin_formset
+            return render_to_string(
+                inline_admin_formset.opts.template,
+                values,
+                request=request,
+            )
+        except KeyError:
+            # The user does not have the permission
+            pass
+    return ""

{django-tabbed-admin3-3.0.0 → django_tabbed_admin3-3.2.0}/tabbed_admin/tests/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from tabbed_admin import TabbedModelAdmin
-from tabbed_admin.tests.models import Band, Musician, Concert, Album, Interview
+from tabbed_admin.tests.models import Album, Band, Concert, Interview, Musician
 
 
 class MusicianInline(admin.StackedInline):
@@ -24,19 +24,9 @@ class BandAdmin(TabbedModelAdmin):
     model = Band
 
     tab_overview = (
-        (None, {
-            'fields': ('name', 'bio', 'style')
-        }),
+        (None, {"fields": ("name", "bio", "style")}),
         MusicianInline,
-        ('Contact', {
-            'fields': ('agent', 'phone', 'email')
-        })
+        ("Contact", {"fields": ("agent", "phone", "email")}),
     )
-    tab_ressources = (
-        ConcertInline,
-        AlbumInline
-    )
-    tabs = [
-        ('Overview', tab_overview),
-        ('Ressources', tab_ressources)
-    ]
+    tab_ressources = (ConcertInline, AlbumInline)
+    tabs = [("Overview", tab_overview), ("Ressources", tab_ressources)]

{django-tabbed-admin3-3.0.0 → django_tabbed_admin3-3.2.0}/tabbed_admin/tests/models.py

@@ -10,12 +10,9 @@ class Band(models.Model):
 
     name = models.CharField(max_length=100)
     bio = models.TextField(blank=True, null=True)
-    style = models.CharField(max_length=100, choices=(
-        (STYLE_ROCK, 'Rock'),
-        (STYLE_FUNK, 'Funk'),
-        (STYLE_JAZZ, 'Jazz'),
-        (STYLE_OVERRIDE, 'Override')
-    ))
+    style = models.PositiveSmallIntegerField(
+        choices=((STYLE_ROCK, "Rock"), (STYLE_FUNK, "Funk"), (STYLE_JAZZ, "Jazz"), (STYLE_OVERRIDE, "Override"))
+    )
     agent = models.CharField(max_length=100, blank=True, null=True)
     phone = models.CharField(max_length=100, blank=True, null=True)
     email = models.CharField(max_length=100, blank=True, null=True)
@@ -26,30 +23,25 @@ class Band(models.Model):
 
 
 class Musician(models.Model):
-    band = models.ForeignKey(Band)
+    band = models.ForeignKey(Band, on_delete=models.CASCADE)
     first_name = models.CharField(max_length=100)
     last_name = models.CharField(max_length=100)
-    specialty = models.CharField(max_length=100, choices=(
-        (1, 'Vocal'),
-        (2, 'Guitar'),
-        (3, 'Bass'),
-        (4, 'Drums')
-    ))
+    specialty = models.PositiveSmallIntegerField(choices=((1, "Vocal"), (2, "Guitar"), (3, "Bass"), (4, "Drums")))
 
 
 class Concert(models.Model):
-    band = models.ForeignKey(Band)
+    band = models.ForeignKey(Band, on_delete=models.CASCADE)
     location = models.CharField(max_length=100)
     date = models.DateField()
 
 
 class Album(models.Model):
-    band = models.ForeignKey(Band)
+    band = models.ForeignKey(Band, on_delete=models.CASCADE)
     name = models.CharField(max_length=100)
     date = models.DateField()
 
 
 class Interview(models.Model):
-    band = models.ForeignKey(Band)
+    band = models.ForeignKey(Band, on_delete=models.CASCADE)
     media_name = models.CharField(max_length=100)
     date = models.DateField()