django-bom 1.240__py3-none-any.whl → 1.252__py3-none-any.whl

bom/admin.py

@@ -6,29 +6,27 @@ 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
+    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 +140,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)

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:

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 (
@@ -55,7 +39,6 @@ from .models import (
     AssemblySubparts,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
@@ -63,20 +46,18 @@ from .models import (
     SellerPart,
     Subpart,
     User,
-    UserMeta,
+    get_user_meta_model,
+    get_organization_model,
 )
 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__)
-
+Organization = get_organization_model()
+UserMeta = get_user_meta_model()
 
 class UserModelChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, user):

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'),)},
+        ),
+    ]

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),
+        ),
+    ]

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)

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:
@@ -27,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()

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>

bom/templates/bom/settings.html

@@ -7,7 +7,7 @@
 
 {% block content %}
     <div class="row container-app">
-        <div class="col s12">
+        <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>
@@ -15,7 +15,7 @@
             </ul>
         </div>
 
-        <div id="user" class="col s12">
+        <div id="user" class="col l8 offset-l2 s12">
             <div class="section">
                 <h4 class="section-title"><i class="material-icons teal-text text-darken-1">person</i>User</h4>
                 <form name="seller" action="{% url 'bom:settings' tab_anchor=USER_TAB %}" method="post">
@@ -30,9 +30,9 @@
                         </div>
                     </div>
                     <div class="row">
-                        {{ user_form.first_name|materializecss:'s12 m4' }}
-                        {{ user_form.last_name|materializecss:'s12 m4' }}
-                        {{ user_form.email|materializecss:'s12 m4' }}
+                        {{ user_form.first_name|materializecss:'s12 l6' }}
+                        {{ user_form.last_name|materializecss:'s12 l6' }}
+                        {{ user_form.email|materializecss:'s12' }}
                     </div>
                     <div class="row">
                         <div class="col s12 right-align">
@@ -57,18 +57,17 @@
             </div>
         </div>
 
-        <div id="indabom" class="col s12">
+        <div id="indabom" class="col s12 l8 offset-l2">
             {% if profile.role == 'A' %}
                 {% if organization.number_scheme == 'S' %}
                     <div class="section">
                         <h4 class="section-title"><i class="material-icons teal-text text-darken-1">category</i>Part
                             Classes</h4>
-                        <p><a href="{% url 'bom:help' %}#part-numbering" target="_blank">What is a part class?</a></p>
                         <form name="seller" action="{% url 'bom:settings' tab_anchor=INDABOM_TAB %}" method="post" enctype="multipart/form-data">
                             {% csrf_token %}
                             {% if part_classes.count > 0 %}
                                 <div class="row" style="margin-bottom: 0;">
-                                    <div class="input-field col s8 m4">
+                                    <div class="input-field col s8 l4">
                                         <select name="part-class-action">
                                             <option value="" disabled selected>Choose your action</option>
                                             <option value="submit-part-class-enable-mouser">Enable Mouser</option>
@@ -77,13 +76,13 @@
                                         </select>
                                         <label>Action</label>
                                     </div>
-                                    <div class="col s2 m2">
+                                    <div class="col s2 l2">
                                         <div class="input-field">
                                             <button class="waves-effect waves-light btn btn-primary" type="submit">Go
                                             </button>
                                         </div>
                                     </div>
-                                    <div class="col s2 m6 right-align">
+                                    <div class="col s2 l6 right-align">
                                         <div class="input-field">
                                             <button class="waves-effect btn-flat btn-icon-round tooltipped"
                                                     type="submit" name="submit-part-class-export"
@@ -130,18 +129,15 @@
                                     </tbody>
                                 </table>
                             {% else %}
-                                <p>No part classes have been defined yet.</p>
+                                <p>No part classes have been defined yet. <a href="{% url 'bom:help' %}#part-numbering"
+                                                                             target="_blank">What is a part class?</a>
+                                </p>
+                                <p>To get started, add your first part class, or upload some here. To help, here is <a
+                                        href="{% static 'bom/doc/sample_part_classes.csv' %}">a sample
+                                    CSV file</a>.</p>
                             {% endif %}
                         </form>
-                        <div class="right-align" style="margin-top: 8px;">
-                            {% if part_classes.count == 0 %}
-                                <div class="left-align" style="margin-bottom: 8px;">
-                                    <a href="{% url 'bom:help' %}#part-numbering" target="_blank">What is a part
-                                        class?</a>
-                                    <p>You may also use <a href="{% static 'bom/doc/sample_part_classes.csv' %}">this
-                                        sample CSV file</a>.</p>
-                                </div>
-                            {% endif %}
+                        <div class="right-align" style="margin-top: 16px;">
                             {% include 'bom/bom-form-modal.html' with modal_title='Upload Part Classes' form=part_class_csv_form action=part_class_form_action name='submit-part-class-upload' modal_description='To batch add part classes, upload a csv that contains columns with the headers<b>`name`</b> and <b>`code`</b>. You may optionally specify a description or comment by including a column with the header <b>`description`</b> or <b>`comment`</b>.' %}
                             {% include 'bom/bom-form-modal.html' with modal_title='Add Part Class' form=part_class_form action=part_class_form_action name='submit-part-class-create' %}
                         </div>
@@ -161,8 +157,8 @@
                                 <b>{{ organization.number_cs }}-{{ organization.number_ns }}
                                     {% if organization.number_vs %}-{{ organization.number_vs }}{% endif %}</b></p>
                             <div class="row">
-                                {{ organization_number_len_form|materializecss:'s4 m2' }}
-                                <div class="col s12 m6 input-field">
+                                {{ organization_number_len_form|materializecss:'s4 l2' }}
+                                <div class="col s12 l6 input-field right-align">
                                     <button class="waves-effect waves-light btn btn-primary" type="submit"
                                             name="submit-number-item-len"
                                             onclick="return confirm('Are you sure you want to change the number of digits?')">
@@ -223,7 +219,7 @@
             {% endif %}
         </div>
 
-        <div id="organization" class="col s12">
+        <div id="organization" class="col s12 l8 offset-l2">
             {% if user.bom_profile.role == 'A' %}
                 <div class="section">
                     <h4 class="section-title"><i class="material-icons teal-text text-darken-1">business</i>Organization
@@ -232,7 +228,7 @@
                           enctype="multipart/form-data">
                         {% csrf_token %}
                         <div class="row">
-                            {{ organization_form|materializecss:'s12 m4' }}
+                            {{ organization_form|materializecss:'s12' }}
                         </div>
                         <div class="row">
                             <div class="col s12 right-align">
@@ -246,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"
@@ -305,60 +304,67 @@
                     </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>
-                </div>
-
-                <div class="section">
-                    <h5 class="section-title"><img title="Via Google Drive"
-                                                   src="{% static 'bom/img/google_drive_logo.svg' %}">Part File Storage
-                        with Google Drive</h5>
-                    {% if not google_authentication %}
-                        <p>Connect your Google account to access Google Drive features.
-                            {% if not organization.google_drive_parent %}Organization owners can enable file storage
-                                using Google Drive. {% if organization.owner == user %}Since you are the owner, you are
-                                able to enable file storage!{% else %}Contact your organization owner to enable.
-                            {% endif %}{% endif %}</p>
-                        <p>When you connect, we will create a folder called <b>IndaBOM Part Files</b> in your root of
-                            Google Drive (and it can be moved anywhere in your drive). To add files to a part, navigate
-                            to the part in IndaBOM, and on the part's <b>Specifications</b> tab, click the <img
-                                    title="Via Google Drive" style="width: 16px; vertical-align: middle;"
-                                    src="{% static 'bom/img/google_drive_logo.svg' %}"> Google Drive link. This will
-                            create a folder for your part in your root IndaBOM directory, or take you there if it
-                            already exists.</p>
-                        <p>You'll be able to access the files directly through Google Drive, and through IndaBOM.</p>
-                    {% else %}
-                        <p>You're connected with Google and can access Google Drive features.</p>
-                    {% endif %}
-                    <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="section">
+                        <h5 class="section-title"><img title="Via Google Drive"
+                                                       src="{% static 'bom/img/google_drive_logo.svg' %}">Part File
+                            Storage
+                            with Google Drive</h5>
+                        {% if not google_authentication %}
+                            <p>Connect your Google account to access Google Drive features.
+                                {% if not organization.google_drive_parent %}Organization owners can enable file storage
+                                    using Google Drive. {% if organization.owner == user %}Since you are the owner, you
+                                    are
+                                    able to enable file storage!{% else %}Contact your organization owner to enable.
+                                {% endif %}{% endif %}</p>
+                            <p>When you connect, we will create a folder called <b>IndaBOM Part Files</b> in your root
+                                of
+                                Google Drive (and it can be moved anywhere in your drive). To add files to a part,
+                                navigate
+                                to the part in IndaBOM, and on the part's <b>Specifications</b> tab, click the <img
+                                        title="Via Google Drive" style="width: 16px; vertical-align: middle;"
+                                        src="{% static 'bom/img/google_drive_logo.svg' %}"> Google Drive link. This will
+                                create a folder for your part in your root IndaBOM directory, or take you there if it
+                                already exists.</p>
+                            <p>You'll be able to access the files directly through Google Drive, and through
+                                IndaBOM.</p>
                         {% 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>
+                            <p>You're connected with Google and can access Google Drive features.</p>
                         {% endif %}
+                        <div>
+                            {% if google_authentication %}
+                                <p>Logged in to Google as: {{ google_authentication.uid }}</p>
+                                <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>
+                                <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>
+                    <div class="section">
+                        <h5 class="section-title"><img title="Sourcing via Mouser.com"
+                                                       src="{% static 'bom/img/mouser.png' %}">Automagic Sourcing via
+                            Mouser
+                        </h5>
+                        <!--<p>No connection required. To enable sourcing via Mouser, select which part classes you'd like
+                            enabled on the Settings IndaBOM tab. Once enabled, sourcing information will appear on part
+                            detail pages in which there are parts sourced via Mouser.</p>-->
+                        <p>Currently under construction.</p>
                     </div>
-                </div>
-                <div class="section">
-                    <h5 class="section-title"><img title="Sourcing via Mouser.com"
-                                                   src="{% static 'bom/img/mouser.png' %}">Automagic Sourcing via Mouser
-                    </h5>
-                    <!--<p>No connection required. To enable sourcing via Mouser, select which part classes you'd like
-                        enabled on the Settings IndaBOM tab. Once enabled, sourcing information will appear on part
-                        detail pages in which there are parts sourced via Mouser.</p>-->
-                    <p>Currently under construction.</p>
                 </div>
             {% endif %}
 

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):

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]:
@@ -357,7 +358,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
@@ -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)
@@ -462,8 +471,7 @@ def bom_settings(request, tab_anchor=None):
             tab_anchor = INDABOM_TAB
             part_class_csv_form = PartClassCSVForm(request.POST, request.FILES, organization=organization)
             if part_class_csv_form.is_valid():
-                for success in part_class_csv_form.successes:
-                    messages.info(request, success)
+                messages.info(request, f'Successfully uploaded {len(part_class_csv_form.successes)} part classes.')
                 for warning in part_class_csv_form.warnings:
                     messages.warning(request, warning)
             else:
@@ -522,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.240.dist-info → django_bom-1.252.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.240
+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.240.dist-info → django_bom-1.252.dist-info}/RECORD

@@ -1,19 +1,19 @@
 bom/__init__.py,sha256=HuvSMR9cYQcppTZGD0XjUVUBtHWwWMh1yMQzk_2wTS4,41
-bom/admin.py,sha256=4xN38uSIGo54MVoo2MXUbvcfuPSAifDc8g0arrEAW4Q,4093
+bom/admin.py,sha256=3fgD0_e5U76P1UT8CTeWbmqo3KK3PKz8ECz-5a_pXEM,4401
 bom/apps.py,sha256=TJMUTSX1h2genPwCq6SN6g1fhrrSmjEXGg2zQFa_ryM,147
-bom/auth_backends.py,sha256=8ViZfP01fITPQnPvsTe_RuKx-ur9dhSOQE3aOp9ESV8,1429
+bom/auth_backends.py,sha256=Xj3MCUJg3r9M4v1c8wrxC3lwpE5F8_2_HD5s9M_5Rms,1480
 bom/base_classes.py,sha256=CrWD7wlIkwYb90VoGcVOcw2WoQszRrCje-Re5d_UW1Q,1183
 bom/constants.py,sha256=5CFE0uvKTL91w24rqdAB6EMgpIyw0HhfmmktxF4gCgs,4296
 bom/context_processors.py,sha256=OxMVCqxGtRoHR7aJfTs6xANpxJQzBDUIuNTG1f_Xjoo,312
 bom/csv_headers.py,sha256=1VDJ7aNqYjDhf5_rfWBZqO6wsIS99oD01yXx2nNmIHQ,12620
 bom/decorators.py,sha256=fCK-lxJTBp3LEdZtKMyQg5hRqxQm5RJny9eb7oyjbtE,1233
 bom/form_fields.py,sha256=tLqchl0j8izBCZnm82NMyHpQV6EuGgCjCl5lrnGR2V0,2816
-bom/forms.py,sha256=RUwiMKeaQkapBwz6JCi4Kkl4e5DlFAgSEMjytEDzmoE,69302
+bom/forms.py,sha256=wmfurA8M0cxc72nLPsMo0-m6JOXzXOhFF2MSRXzZnVI,68836
 bom/helpers.py,sha256=ONsDM0agG9sKJWMjN4IRNlWx2HNF7T0CXM-ts0GRiAY,15031
 bom/local_settings.py,sha256=yE4aupIquCWsFms44qoCrRrlIyM3sqpOkiwyj1WLxI8,820
-bom/models.py,sha256=poZoct60kAULCs8RlqC3MFtOl84l2ZfZzjb_d3t9z2g,36537
+bom/models.py,sha256=GWnSNEDP5po_fo9CphwtimZTFkSrbjKCs6zg0g-LKD8,37834
 bom/part_bom.py,sha256=30HYAKAEhtadiM9tk6vgCQnn7gNJeuXbzF5gXvMvKG4,8720
-bom/settings.py,sha256=jUuy7cKuz9gbZ301L0skMFrnU6qKaBpRUf-rHsTTYJM,8387
+bom/settings.py,sha256=aBg0PHaK9NvNZNmfnPrU4-kp2GQeeAGMB_EVvMoAmJs,8197
 bom/tests.py,sha256=ZqcTUYVXeWjAqzKAV6hp6SKTU0_IOTwIEboTujl7N_M,69905
 bom/urls.py,sha256=sGNKO8BsTO_TDPsqB-c_fqRozaNHOf9WYRaOy-7OLAE,6841
 bom/utils.py,sha256=z_2jACSkRc0hsc0mdR8tOK10KiSDeM0a6rXIpztPDuA,7302
@@ -68,6 +68,8 @@ bom/migrations/0046_alter_sellerpart_unique_together.py,sha256=KcOwhf5Vh02wDq_Z3
 bom/migrations/0047_sellerpart_seller_part_number.py,sha256=QdjdWMNlSyLHB7uSTq_8xhPxnYAXR8yht-d_AsMvJBw,446
 bom/migrations/0048_rename_part_organization_number_class_bom_part_organiz_b333d6_idx_and_more.py,sha256=rZ_mfd_xFu4BglhYxkNuQVqwThZ721kjrlCAn9LkNRo,50969
 bom/migrations/0049_alter_assembly_id_alter_assemblysubparts_id_and_more.py,sha256=l1q5BCNVYWD6Ngf9pGzYq1hQMvvshmdFlm33On63YNc,3247
+bom/migrations/0050_alter_organization_options.py,sha256=n-YGAoUdUxYdh5NY0Zpz2T4CWEOR7tDjSFFk-KZD_tw,432
+bom/migrations/0051_alter_manufacturer_organization_and_more.py,sha256=xjnkZhEgsJDsfK9leBPxxQ2oG_Qf2FdrttTx-lldmjw,1539
 bom/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bom/static/bom/css/dashboard.css,sha256=saLXUpnVRjsV9HNdsmQD4Eq-zBlm8R2YePhvoc1uifk,245
 bom/static/bom/css/jquery.treetable.css,sha256=H37aGBAAFP3R6v08nui9gKSdLE2VGsGsmlttrIImzfE,652
@@ -149,7 +151,7 @@ bom/templates/bom/help.html,sha256=hi16fwtVqeWP3Vb3vOpLSKx0ioB1MODJ8lkh6bczfiM,8
 bom/templates/bom/manufacturer-info.html,sha256=jR98qXONqquEeda92djQgmFfmJiC8jbsGgyXuzJY100,3742
 bom/templates/bom/manufacturers.html,sha256=3ZF8Up-IiAvR6CCmrj_92qPPh7vKrVQaEN05KKX2yrA,5550
 bom/templates/bom/nothing-to-see.html,sha256=cRspNAHlSfv7KjQwp34gANhVqQbXzfFpqtRSm6NoV9s,657
-bom/templates/bom/organization-create.html,sha256=4o3C58CQDF3Jz1cZ1UPoLfX0qNvwMKK3UnFeXGMmPww,7899
+bom/templates/bom/organization-create.html,sha256=yLrEJH8BlD-W1USk8pYAzTvr-Qw9ZM5rBGYO3n6lCu0,7982
 bom/templates/bom/part-info.html,sha256=lilYygmR8cQhQ5lJeYK6dj-OdIm72s1SerELHqyrPSs,25406
 bom/templates/bom/part-revision-display.html,sha256=t_wwzf910fhBc2vFjqoISnhX4OEr7pkfh8R-RGq_6ac,5509
 bom/templates/bom/part-revision-edit.html,sha256=gOWiRd8Vq0z912_fI9UtBC0yYkcF_lruMQfAWN4kqw0,1624
@@ -159,7 +161,7 @@ bom/templates/bom/part-revision-release.html,sha256=voG7wmYc1Cm3e_H1IasvQcPuyqnn
 bom/templates/bom/search-help.html,sha256=Wh_tXBJtz0bznk0F1C7OSdRhMe2qpOs9NMCBb2i0CFI,4398
 bom/templates/bom/seller-info.html,sha256=MACsHMYQXMWfRslXuvh9hD2z28VXzVi0DSy4yg7WQMk,3595
 bom/templates/bom/sellers.html,sha256=6ut7LwRMGUKYB4BRjiSpDBP9BGgqT7nxpNQpUVWDvkw,5412
-bom/templates/bom/settings.html,sha256=9uEAG_IpcVgGZT_lGQyKnc83qpoNjoN3qNs_PtBAj0s,27749
+bom/templates/bom/settings.html,sha256=az0QXxrCPEDa8XRG7q3ASDe8dIP3G941qKmijrzwczw,28241
 bom/templates/bom/signup.html,sha256=tB_x7q3IufSNXsd9Dfh8fdWpkiWSGH2_Zgw749B1PaU,884
 bom/templates/bom/subscription_panel.html,sha256=Ute49APwiXONQW2z0AApJRaSwnwtsYt3_opn0bW5BX8,843
 bom/templates/bom/table_of_contents.html,sha256=7wXWOfmVkk5Itjax5x1PE-g5QjxqmYBr7RW8NgtGRng,1763
@@ -177,10 +179,10 @@ bom/third_party_apis/google_drive.py,sha256=8ECE9_8f1KAyNTtkalws-Gl51wxAaTLP40bD
 bom/third_party_apis/mouser.py,sha256=q2-p0k2n-LNel_QRlfak0kAXT-9hh59k_Pt51PTG09s,5576
 bom/third_party_apis/test_apis.py,sha256=2W0jtTisGTmktC7l556pn9-pZYseTQmmQfo6_4uP4Dc,679
 bom/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bom/views/json_views.py,sha256=CaDMxHGnp2182ZV9QZfNkgM7tc_rNmokkelav9rF2dE,2462
-bom/views/views.py,sha256=SvD7Yku9rPwLFmrWC0c15g_a0nC-YkCOnIqEVC32DfU,72267
-django_bom-1.240.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-django_bom-1.240.dist-info/METADATA,sha256=yhPn8NcuAiVTvnEPvwxwH6j-N_jI8qDjyELM4Mv-6K4,7558
-django_bom-1.240.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_bom-1.240.dist-info/top_level.txt,sha256=6zytg4lnnobI96dO-ZEadPOCslrrFmf4t2Pnv-y8x0Y,4
-django_bom-1.240.dist-info/RECORD,,
+bom/views/json_views.py,sha256=LK3-njLZrILLqZxCuE-_sUEC2z2GBxQFRysX67-h14c,2334
+bom/views/views.py,sha256=IB0pgdQojvuvykopTdpM42m8EMgy8oYJ4Ui01TR30Ys,73146
+django_bom-1.252.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+django_bom-1.252.dist-info/METADATA,sha256=JCrxqDW9rFFK-tSg056gcNzbkcVU89iuahZ1tiKCK7o,7558
+django_bom-1.252.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_bom-1.252.dist-info/top_level.txt,sha256=6zytg4lnnobI96dO-ZEadPOCslrrFmf4t2Pnv-y8x0Y,4
+django_bom-1.252.dist-info/RECORD,,