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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.245
+Version: 1.252
 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.245 → django_bom-1.252}/bom/admin.py

@@ -6,17 +6,19 @@ from .models import (
     Assembly,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
     Seller,
     SellerPart,
     Subpart,
-    UserMeta,
+    get_organization_model,
+    get_user_meta_model
 )
 
 User = get_user_model()
+UserMeta = get_user_meta_model()
+Organization = get_organization_model()
 
 class UserMetaInline(admin.TabularInline):
     model = UserMeta

{django_bom-1.245 → django_bom-1.252}/bom/auth_backends.py

@@ -1,7 +1,9 @@
 from typing import Optional
 
 from . import constants
-from .models import Organization
+from .models import get_organization_model
+
+Organization = get_organization_model()
 
 
 class OrganizationPermissionBackend:

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

@@ -39,7 +39,6 @@ from .models import (
     AssemblySubparts,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
@@ -47,7 +46,8 @@ from .models import (
     SellerPart,
     Subpart,
     User,
-    UserMeta,
+    get_user_meta_model,
+    get_organization_model,
 )
 from .utils import (
     listify_string,
@@ -56,7 +56,8 @@ from .utils import (
 from .validators import alphanumeric
 
 logger = logging.getLogger(__name__)
-
+Organization = get_organization_model()
+UserMeta = get_user_meta_model()
 
 class UserModelChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, user):

django_bom-1.252/bom/migrations/0051_alter_manufacturer_organization_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 5.2.8 on 2026-01-04 00:59
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bom', '0050_alter_organization_options'),
+        migrations.swappable_dependency(settings.BOM_ORGANIZATION_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='manufacturer',
+            name='organization',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.BOM_ORGANIZATION_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='organization',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.BOM_ORGANIZATION_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='partclass',
+            name='organization',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.BOM_ORGANIZATION_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='seller',
+            name='organization',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.BOM_ORGANIZATION_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='usermeta',
+            name='organization',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.BOM_ORGANIZATION_MODEL),
+        ),
+    ]

{django_bom-1.245 → django_bom-1.252}/bom/models.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 import logging
 
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
@@ -23,32 +24,54 @@ logger = logging.getLogger(__name__)
 User = get_user_model()
 
 
+def get_user_meta_model():
+    from django.apps import apps
+    from django.conf import settings
+    return apps.get_model(settings.BOM_USER_META_MODEL)
+
+
+def get_organization_model():
+    from django.apps import apps
+    from django.conf import settings
+    return apps.get_model(settings.BOM_ORGANIZATION_MODEL)
+
+
+def _user_meta(self, organization=None):
+    from django.apps import apps
+    from django.conf import settings
+    UserMetaModel = apps.get_model(settings.BOM_USER_META_MODEL)
+    meta, created = UserMetaModel.objects.get_or_create(
+        user=self,
+        defaults={'organization': organization}
+    )
+    return meta
+
+
 class OrganizationScopedModel(models.Model):
-    organization = models.ForeignKey('Organization', on_delete=models.CASCADE, db_index=True)
+    organization = models.ForeignKey(settings.BOM_ORGANIZATION_MODEL, on_delete=models.CASCADE, db_index=True)
 
     class Meta:
         abstract = True
 
 
-class Organization(models.Model):
+class AbstractOrganization(models.Model):
     name = models.CharField(max_length=255, default=None)
-    subscription = models.CharField(max_length=1, choices=SUBSCRIPTION_TYPES)
-    subscription_quantity = models.IntegerField(default=0)
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     number_scheme = models.CharField(max_length=1, choices=NUMBER_SCHEMES, default=NUMBER_SCHEME_SEMI_INTELLIGENT)
     number_class_code_len = models.PositiveIntegerField(default=NUMBER_CLASS_CODE_LEN_DEFAULT,
-                                                        validators=[MinValueValidator(NUMBER_CLASS_CODE_LEN_MIN), MaxValueValidator(NUMBER_CLASS_CODE_LEN_MAX)])
+                                                        validators=[MinValueValidator(NUMBER_CLASS_CODE_LEN_MIN),
+                                                                    MaxValueValidator(NUMBER_CLASS_CODE_LEN_MAX)])
     number_item_len = models.PositiveIntegerField(default=NUMBER_ITEM_LEN_DEFAULT,
-                                                  validators=[MinValueValidator(NUMBER_ITEM_LEN_MIN), MaxValueValidator(NUMBER_ITEM_LEN_MAX)])
+                                                  validators=[MinValueValidator(NUMBER_ITEM_LEN_MIN),
+                                                              MaxValueValidator(NUMBER_ITEM_LEN_MAX)])
     number_variation_len = models.PositiveIntegerField(default=NUMBER_VARIATION_LEN_DEFAULT,
-                                                       validators=[MinValueValidator(NUMBER_VARIATION_LEN_MIN), MaxValueValidator(NUMBER_VARIATION_LEN_MAX)])
+                                                       validators=[MinValueValidator(NUMBER_VARIATION_LEN_MIN),
+                                                                   MaxValueValidator(NUMBER_VARIATION_LEN_MAX)])
     google_drive_parent = models.CharField(max_length=128, blank=True, default=None, null=True)
     currency = CurrencyField(max_length=3, choices=CURRENCY_CHOICES, default='USD')
 
-    class Meta:
-        permissions = (
-            ("manage_members", "Can manage organization members"),
-        )
+    subscription = models.CharField(max_length=1, choices=SUBSCRIPTION_TYPES)
+    subscription_quantity = models.IntegerField(default=0)
 
     def number_cs(self):
         return "C" * self.number_class_code_len
@@ -76,13 +99,25 @@ class Organization(models.Model):
         return self.owner.email
 
     def save(self, *args, **kwargs):
-        super(Organization, self).save()
-        SellerPart.objects.filter(seller__organization=self).update(unit_cost_currency=self.currency, nre_cost_currency=self.currency)
+        super(AbstractOrganization, self).save()
+        SellerPart.objects.filter(seller__organization=self).update(unit_cost_currency=self.currency,
+                                                                    nre_cost_currency=self.currency)
 
+    class Meta:
+        abstract = True
+
+
+class Organization(AbstractOrganization):
+    class Meta:
+        swappable = 'BOM_ORGANIZATION_MODEL'
+        permissions = (
+            ("manage_members", "Can manage organization members"),
+        )
 
-class UserMeta(models.Model):
+
+class AbstractUserMeta(models.Model):
     user = models.OneToOneField(settings.AUTH_USER_MODEL, db_index=True, on_delete=models.CASCADE)
-    organization = models.ForeignKey(Organization, blank=True, null=True, on_delete=models.CASCADE)
+    organization = models.ForeignKey(settings.BOM_ORGANIZATION_MODEL, blank=True, null=True, on_delete=models.CASCADE)
     role = models.CharField(max_length=1, choices=ROLE_TYPES)
 
     def get_or_create_organization(self):
@@ -92,7 +127,9 @@ class UserMeta(models.Model):
             else:
                 org_name = self.user.first_name + ' ' + self.user.last_name
 
-            organization, created = Organization.objects.get_or_create(owner=self.user, defaults={'name': org_name, 'subscription': 'F'})
+            OrganizationModel = apps.get_model(settings.BOM_ORGANIZATION_MODEL)
+            organization, created = OrganizationModel.objects.get_or_create(owner=self.user, defaults={'name': org_name,
+                                                                                                       'subscription': 'F'})
 
             self.organization = organization
             self.role = 'A'
@@ -109,10 +146,13 @@ class UserMeta(models.Model):
     def is_organization_owner(self) -> bool:
         return self.organization.owner == self.user if self.organization else False
 
-    def _user_meta(self, organization=None):
-        return UserMeta.objects.get_or_create(user=self, defaults={'organization': organization})[0]
+    class Meta:
+        abstract = True
 
-    User.add_to_class('bom_profile', _user_meta)
+
+class UserMeta(AbstractUserMeta):
+    class Meta:
+        swappable = 'BOM_USER_META_MODEL'
 
 
 class PartClass(OrganizationScopedModel):
@@ -730,3 +770,6 @@ class SellerPart(models.Model, AsDictModel):
 
     def __str__(self):
         return u'%s' % (self.manufacturer_part.part.full_part_number() + ' ' + self.seller.name)
+
+
+User.add_to_class('bom_profile', _user_meta)

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

@@ -23,6 +23,8 @@ BOM_CONFIG_DEFAULT = {
         'page_size': 50,
     }
 }
+BOM_ORGANIZATION_MODEL = 'bom.Organization'
+BOM_USER_META_MODEL = 'bom.UserMeta'
 
 # Apply custom settings over defaults
 bom_config_new = BOM_CONFIG_DEFAULT.copy()

{django_bom-1.245 → django_bom-1.252}/bom/templates/bom/organization-create.html

@@ -40,9 +40,12 @@
 
         <div id="join-organization" style="display: none;">
             <h3 class="center">Join an existing Organization</h3>
-            <h5 class="center" style="padding-top: 36px;">To join an existing organization, you must provide the e-mail address you signed up with to your IndaBOM organization owner. <br><br>Your e-mail address is {{ user.email }}, click
-                <a href="mailto:?subject=Add me to your IndaBOM Organization&body=Hi,%0D%0A%0D%0APlease add me to your IndaBOM organization. To do so, log in, go to Settings > Organization and add me via my e-mail address {{ user.email }}">here</a>
-                to send an email.</h5>
+            <h5 class="center" style="padding-top: 36px;">To join an existing organization, you must provide your
+                username (not e-mail) to your IndaBOM organization owner. <br><br>Your username is
+                <b>{{ user.username }}</b>
+                click
+                <a href="mailto:?subject=Add me to your IndaBOM Organization&body=Hi,%0D%0A%0D%0APlease add me to your IndaBOM organization. To do so, log in, go to Settings > Organization and add me via my username {{ user.username }}">here</a>
+                to send an e-mail to your organization owner with instructions.</h5>
             <br><br>
             <p class="center">Oops! I meant to <a class="modal-trigger" onclick="resetView()">create a new organization</a>.</p>
         </div>

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

@@ -7,7 +7,7 @@
 
 {% block content %}
     <div class="row container-app">
-        <div class="col s8 offset-s2">
+        <div class="col s12 l8 offset-l2">
             <ul id="tabs" class="tabs tabs-fixed-width">
                 <li class="tab"><a id="user-tab" href="#user">User</a></li>
                 <li class="tab"><a id="indabom-tab" href="#indabom">IndaBOM</a></li>

{django_bom-1.245 → django_bom-1.252}/bom/views/json_views.py

@@ -5,9 +5,9 @@ from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bom.models import Part, PartClass, Subpart, SellerPart, Organization, Manufacturer, ManufacturerPart, User, UserMeta, PartRevision, Assembly, AssemblySubparts
-from bom.third_party_apis.mouser import Mouser
+from bom.models import PartRevision
 from bom.third_party_apis.base_api import BaseApiError
+from bom.third_party_apis.mouser import Mouser
 
 
 class BomJsonResponse(View):

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

@@ -69,11 +69,12 @@ from bom.models import (
     SellerPart,
     Subpart,
     User,
-    UserMeta,
+    get_user_meta_model
 )
 from bom.utils import check_references_for_duplicates, listify_string, prep_for_sorting_nicely
 
 logger = logging.getLogger(__name__)
+UserMeta = get_user_meta_model()
 BOM_LOGIN_URL = getattr(settings, "BOM_LOGIN_URL", None) or settings.LOGIN_URL
 
 def form_error_messages(form_errors) -> [str]:
@@ -400,8 +401,13 @@ def bom_settings(request, tab_anchor=None):
                     added_user_profile = user_add_form.save()
                     messages.info(request, f"Added {added_user_profile.user.first_name} {added_user_profile.user.last_name} to your organization.")
                 else:
-                    messages.error(request, user_add_form.errors)
-
+                    for field, errors in user_add_form.errors.items():
+                        for error in errors:
+                            messages.error(request, f"{field.capitalize()}: {error}")
+            users_in_organization.all()
+            users_in_organization_count = users_in_organization.count()
+            has_member_capacity = users_in_organization_count < organization.subscription_quantity
+            seats_available = max(organization.subscription_quantity - users_in_organization_count, 0)
         elif 'clear-add-user' in request.POST:
             tab_anchor = ORGANIZATION_TAB
             user_add_form = UserAddForm()
@@ -421,7 +427,10 @@ def bom_settings(request, tab_anchor=None):
                             user_meta.save()
                     except UserMeta.DoesNotExist:
                         messages.error(request, "No user found with given id {}.".format(user_meta_id))
-
+            users_in_organization.all()
+            users_in_organization_count = users_in_organization.count()
+            has_member_capacity = users_in_organization_count < organization.subscription_quantity
+            seats_available = max(organization.subscription_quantity - users_in_organization_count, 0)
         elif 'submit-edit-organization' in request.POST:
             tab_anchor = ORGANIZATION_TAB
             organization_form = OrganizationFormEditSettings(request.POST, instance=organization, user=user)
@@ -521,6 +530,8 @@ def bom_settings(request, tab_anchor=None):
                 profile.save()
                 if users_in_organization == 0:
                     organization.delete()
+        else:
+            messages.warning(request, "No action was taken because no form field was submitted.")
 
     user_form = UserForm(instance=user)
     user_add_form = UserAddForm()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.245
+Version: 1.252
 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.245 → django_bom-1.252}/django_bom.egg-info/SOURCES.txt

@@ -73,6 +73,7 @@ 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/0051_alter_manufacturer_organization_and_more.py
 bom/migrations/__init__.py
 bom/static/bom/css/dashboard.css
 bom/static/bom/css/jquery.treetable.css

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

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