django-bom 1.241__tar.gz → 1.245__tar.gz

{django_bom-1.241/django_bom.egg-info → django_bom-1.245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.241
+Version: 1.245
 Summary: A simple Django app to manage a bill of materials.
 Author-email: Mike Kasparian <mpkasp@gmail.com>
 License: GPL-3.0-only

{django_bom-1.241 → django_bom-1.245}/bom/admin.py

@@ -16,19 +16,15 @@ from .models import (
     UserMeta,
 )
 
-
 User = get_user_model()
 
 class UserMetaInline(admin.TabularInline):
     model = UserMeta
+    verbose_name = 'BOM User Meta'
     raw_id_fields = ('organization',)
     can_delete = False
 
 
-class UserAdmin(UserAdmin):
-    inlines = (UserMetaInline,)
-
-
 class OrganizationAdmin(admin.ModelAdmin):
     list_display = ('name',)
 
@@ -142,13 +138,21 @@ class AssemblyAdmin(admin.ModelAdmin):
     ]
 
 
-# Try to unregister User model
-try:
-    admin.site.unregister(User)
-except admin.sites.NotRegistered:
-    pass
+current_admin = admin.site._registry.get(User)
+
+if current_admin:
+    admin_class = current_admin.__class__
+    inlines = list(admin_class.inlines or [])
+    if UserMetaInline not in inlines:
+        inlines.append(UserMetaInline)
+        admin_class.inlines = inlines
+else:
+    class BomUserAdmin(UserAdmin):
+        inlines = [UserMetaInline]
+
+
+    admin.site.register(User, BomUserAdmin)
 
-admin.site.register(User, UserAdmin)
 admin.site.register(Organization, OrganizationAdmin)
 admin.site.register(Seller, SellerAdmin)
 admin.site.register(SellerPart, SellerPartAdmin)

{django_bom-1.241 → django_bom-1.245}/bom/forms.py

@@ -1,41 +1,27 @@
 import codecs
 import csv
 import logging
-from typing import Type, TypeVar
 
 from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.core.exceptions import ValidationError
-from django.core.validators import MaxLengthValidator, MaxValueValidator, MinLengthValidator, MinValueValidator
+from django.core.validators import MaxLengthValidator, MinLengthValidator
 from django.db import IntegrityError
 from django.forms.models import model_to_dict
 from django.utils.translation import gettext_lazy as _
-
 from djmoney.money import Money
 
 from .constants import (
-    CONFIGURATION_TYPES,
     CURRENT_UNITS,
     DISTANCE_UNITS,
     FREQUENCY_UNITS,
     INTERFACE_TYPES,
     MEMORY_UNITS,
-    NUMBER_CLASS_CODE_LEN_DEFAULT,
-    NUMBER_CLASS_CODE_LEN_MAX,
-    NUMBER_CLASS_CODE_LEN_MIN,
-    NUMBER_ITEM_LEN_DEFAULT,
-    NUMBER_ITEM_LEN_MAX,
-    NUMBER_ITEM_LEN_MIN,
     NUMBER_SCHEME_INTELLIGENT,
     NUMBER_SCHEME_SEMI_INTELLIGENT,
-    NUMBER_VARIATION_LEN_DEFAULT,
-    NUMBER_VARIATION_LEN_MAX,
-    NUMBER_VARIATION_LEN_MIN,
     PACKAGE_TYPES,
     POWER_UNITS,
     ROLE_TYPE_VIEWER,
-    ROLE_TYPES,
-    SUBSCRIPTION_TYPES,
     TEMPERATURE_UNITS,
     VALUE_UNITS,
     VOLTAGE_UNITS,
@@ -43,11 +29,9 @@ from .constants import (
     WEIGHT_UNITS,
 )
 from .csv_headers import (
-    BOMFlatCSVHeaders,
     BOMIndentedCSVHeaders,
     CSVHeaderError,
     PartClassesCSVHeaders,
-    PartsListCSVHeaders,
 )
 from .form_fields import AutocompleteTextInput
 from .models import (
@@ -66,14 +50,10 @@ from .models import (
     UserMeta,
 )
 from .utils import (
-    check_references_for_duplicates,
-    get_from_dict,
     listify_string,
-    prep_for_sorting_nicely,
     stringify_list,
 )
-from .validators import alphanumeric, decimal, numeric
-
+from .validators import alphanumeric
 
 logger = logging.getLogger(__name__)
 

django_bom-1.245/bom/migrations/0050_alter_organization_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.8 on 2025-12-16 18:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bom', '0049_alter_assembly_id_alter_assemblysubparts_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='organization',
+            options={'permissions': (('manage_members', 'Can manage organization members'),)},
+        ),
+    ]

{django_bom-1.241 → django_bom-1.245}/bom/settings.py

@@ -1,16 +1,12 @@
-import os
 import logging
+import os
 from pathlib import Path
-from django.utils.log import DEFAULT_LOGGING
 
-# --------------------------------------------------------------------------
-# BASE CONFIGURATION & LOCAL SETTINGS
-# --------------------------------------------------------------------------
+from django.utils.log import DEFAULT_LOGGING
 
 logger = logging.getLogger(__name__)
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-# Attempt to load local settings (similar pattern to your original, but clean)
 try:
     from .local_settings import *
 except ImportError:

{django_bom-1.241 → django_bom-1.245}/bom/templates/bom/settings.html

@@ -228,7 +228,7 @@
                           enctype="multipart/form-data">
                         {% csrf_token %}
                         <div class="row">
-                            {{ organization_form|materializecss:'s12 l4' }}
+                            {{ organization_form|materializecss:'s12' }}
                         </div>
                         <div class="row">
                             <div class="col s12 right-align">
@@ -242,6 +242,9 @@
                     </form>
                 </div>
 
+                {# Subscription & Billing placed after Users for a more natural flow #}
+                {% include 'bom/subscription_panel.html' %}
+
                 <div class="section">
                     <h4 class="section-title"><i class="material-icons teal-text text-darken-1">group</i>Users</h4>
                     <form name="seller" action="{% url 'bom:settings' tab_anchor=ORGANIZATION_TAB %}" method="post"
@@ -301,9 +304,6 @@
                     </form>
                 </div>
 
-                {# Subscription & Billing placed after Users for a more natural flow #}
-                {% include 'bom/subscription_panel.html' %}
-
                 <div class="section">
                     <h4 class="section-title"><i
                             class="material-icons teal-text text-darken-1">integration_instructions</i>Integrations</h4>
@@ -336,17 +336,22 @@
                         <div>
                             {% if google_authentication %}
                                 <p>Logged in to Google as: {{ google_authentication.uid }}</p>
-                                <form action="{% url 'social:disconnect' 'google-oauth2' %}" method="post">
-                                    {% csrf_token %}
-                                    <button class="waves-effect waves-light btn btn-primary" type="submit">Disconnect
-                                    </button>
-                                </form>
+                                <div class="right-align">
+                                    <form action="{% url 'social:disconnect' 'google-oauth2' %}" method="post">
+                                        {% csrf_token %}
+                                        <button class="waves-effect waves-light btn btn-primary" type="submit">
+                                            Disconnect
+                                        </button>
+                                    </form>
+                                </div>
                             {% else %}
                                 <p>To get started, sign in with Google:</p>
-                                <a href="{% url "social:begin" "google-oauth2" %}">
-                                    <img title="Google sign-in."
-                                         src="{% static 'bom/img/google/web/1x/btn_google_signin_dark_normal_web.png' %}">
-                                </a>
+                                <div class="right-align">
+                                    <a href="{% url "social:begin" "google-oauth2" %}">
+                                        <img title="Google sign-in."
+                                             src="{% static 'bom/img/google/web/1x/btn_google_signin_dark_normal_web.png' %}">
+                                    </a>
+                                </div>
                             {% endif %}
                         </div>
                     </div>

{django_bom-1.241 → django_bom-1.245}/bom/views/views.py

@@ -357,7 +357,7 @@ def bom_settings(request, tab_anchor=None):
     part_classes = PartClass.objects.all().filter(organization=organization)
 
     users_in_organization = User.objects.filter(
-        id__in=UserMeta.objects.filter(organization=organization).values_list('user', flat=True)).exclude(id__in=[organization.owner.id]).order_by(
+        id__in=UserMeta.objects.filter(organization=organization).values_list('user', flat=True)).order_by(
         'first_name', 'last_name', 'email')
     users_in_organization_count = users_in_organization.count()
     has_member_capacity = users_in_organization_count < organization.subscription_quantity

{django_bom-1.241 → django_bom-1.245/django_bom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.241
+Version: 1.245
 Summary: A simple Django app to manage a bill of materials.
 Author-email: Mike Kasparian <mpkasp@gmail.com>
 License: GPL-3.0-only

{django_bom-1.241 → django_bom-1.245}/django_bom.egg-info/SOURCES.txt

@@ -72,6 +72,7 @@ bom/migrations/0046_alter_sellerpart_unique_together.py
 bom/migrations/0047_sellerpart_seller_part_number.py
 bom/migrations/0048_rename_part_organization_number_class_bom_part_organiz_b333d6_idx_and_more.py
 bom/migrations/0049_alter_assembly_id_alter_assemblysubparts_id_and_more.py
+bom/migrations/0050_alter_organization_options.py
 bom/migrations/__init__.py
 bom/static/bom/css/dashboard.css
 bom/static/bom/css/jquery.treetable.css

{django_bom-1.241 → django_bom-1.245}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-bom"
-version = "1.241"
+version = "1.245"
 description = "A simple Django app to manage a bill of materials."
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.10"