django-spire 0.19.3__py3-none-any.whl → 0.19.4__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.19.3'
+__VERSION__ = '0.19.4'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/core/management/commands/spire_startapp_pkg/maps.py

@@ -29,6 +29,7 @@ class AppConfiguration:
         components: list[str],
         user_inputs: dict[str, str] | None = None
     ) -> AppConfiguration:
+        immediate_parent = components[-2] if len(components) > 2 else None
         parent_parts = components[1:-1] if len(components) > 1 else []
 
         app_name = (
@@ -49,8 +50,8 @@ class AppConfiguration:
         )
 
         default_label = (
-            '_'.join(parent_parts).lower() + '_' + app_name.lower()
-            if parent_parts
+            immediate_parent.lower() + '_' + app_name.lower()
+            if immediate_parent
             else app_name.lower()
         )
 
@@ -60,10 +61,16 @@ class AppConfiguration:
             else default_label
         )
 
+        default_db_table = (
+            '_'.join(parent_parts).lower() + '_' + app_name.lower()
+            if parent_parts
+            else app_name.lower()
+        )
+
         db_table = (
-            user_inputs.get('db_table_name', default_label)
+            user_inputs.get('db_table_name', default_db_table)
             if user_inputs
-            else default_label
+            else default_db_table
         )
 
         inherit_permissions = (
@@ -324,7 +331,7 @@ class ModelPermissions:
         user_inputs: dict[str, str] | None = None
     ) -> ModelPermissions:
         module = '.'.join(components)
-        parent_parts = components[1:-1] if len(components) > 1 else []
+        immediate_parent = components[-2] if len(components) > 2 else None
 
         app_name = (
             user_inputs.get('app_name', components[-1])
@@ -344,8 +351,8 @@ class ModelPermissions:
         )
 
         default_permission_name = (
-            '_'.join(parent_parts).lower() + '_' + app_name.lower()
-            if parent_parts
+            immediate_parent.lower() + '_' + app_name.lower()
+            if immediate_parent
             else app_name.lower()
         )
 

django_spire/core/management/commands/spire_startapp_pkg/user_input.py

@@ -49,7 +49,7 @@ class UserInputCollector:
         app_label = self._collect_app_label(components, app_name)
         model_name = self._collect_model_name(app_name)
         model_name_plural = self._collect_model_name_plural(model_name)
-        db_table_name = self._collect_db_table_name(app_label)
+        db_table_name = self._collect_db_table_name(components, app_name)  # Changed from app_label to components, app_name
         model_permission_path = self._collect_model_permission_path(app_path, model_name)
 
         permission_data = self._collect_permission_inheritance(components)
@@ -78,8 +78,8 @@ class UserInputCollector:
         :return: User-provided or default app label.
         """
 
-        parent_parts = components[1:-1] if len(components) > 1 else []
-        default = '_'.join(parent_parts).lower() + '_' + app_name.lower() if parent_parts else app_name.lower()
+        immediate_parent = components[-2] if len(components) > 2 else None
+        default = immediate_parent.lower() + '_' + app_name.lower() if immediate_parent else app_name.lower()
         return self._collect_input('Enter the app label', default, '3/8')
 
     def _collect_app_name(self, components: list[str]) -> str:
@@ -114,15 +114,18 @@ class UserInputCollector:
 
         return app_path
 
-    def _collect_db_table_name(self, app_label: str) -> str:
+    def _collect_db_table_name(self, components: list[str], app_name: str) -> str:
         """
         Prompts the user for the database table name.
 
-        :param app_label: App label to use as default.
+        :param components: List of app path components.
+        :param app_name: Name of the app.
         :return: User-provided or default database table name.
         """
 
-        return self._collect_input('Enter the database table name', app_label, '6/8')
+        parent_parts = components[1:-1] if len(components) > 1 else []
+        default = '_'.join(parent_parts).lower() + '_' + app_name.lower() if parent_parts else app_name.lower()
+        return self._collect_input('Enter the database table name', default, '6/8')
 
     def _collect_input(self, prompt: str, default: str, step_number: str) -> str:
         """
@@ -183,7 +186,7 @@ class UserInputCollector:
         :return: Dictionary containing permission inheritance settings.
         """
 
-        if len(components) <= 2:
+        if len(components) <= 1:
             return {'inherit_permissions': False, 'parent_permission_prefix': '', 'parent_model_instance_name': ''}
 
         if not self._should_inherit_permissions():

django_spire/core/static/django_spire/css/app-navigation.css

@@ -73,6 +73,10 @@
     transition: background-color 0.2s ease, color 0.2s ease;
 }
 
+.side-navigation a.active {
+    color: var(--app-side-navigation-link-color) !important;
+}
+
 .side-navigation a:hover {
     color: var(--app-side-navigation-link-hover-color) !important;
 }

django_spire/core/templatetags/spire_core_tags.py

@@ -79,6 +79,17 @@ def index(indexable: Sequence[U], index_value: int) -> U | Sequence[U]:
         return indexable
 
 
+@register.filter(name='is_path')
+def is_path(current: str, url: str) -> bool:
+    if not current or not url:
+        return False
+
+    if current == url:
+        return True
+
+    return url != '/' and current.startswith(url)
+
+
 @register.simple_tag()
 def generate_id() -> str:
     """

{django_spire-0.19.3.dist-info → django_spire-0.19.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.19.3
+Version: 0.19.4
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.

{django_spire-0.19.3.dist-info → django_spire-0.19.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=c5Hs-7lk9T15254tOasiQ2ZTFLQIVJof9_QJDfm1PAI,933
-django_spire/consts.py,sha256=_orNcz_DOMU-_wDzuaNdwpZye_OrFWc-MpTqdb1mECg,171
+django_spire/consts.py,sha256=MtDZv4mhMaz4wgBAinDZk6VFo5x5VSTHfVNEwz0GQDE,171
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=_bM5uUqJXq3sW-NZBNAzt4egZwmvLq_jA8DaQGHqVoE,661
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -434,13 +434,13 @@ django_spire/core/management/commands/spire_startapp_pkg/builder.py,sha256=gb401
 django_spire/core/management/commands/spire_startapp_pkg/config.py,sha256=yBtlIcyoK0MFpgP8izB6yzX9jWQIenQ_5D62kYM2D3o,3372
 django_spire/core/management/commands/spire_startapp_pkg/filesystem.py,sha256=TjZZGKqVGrTRr37rWxc0vCcUsviV28DcNCZ2Fo5yz80,3020
 django_spire/core/management/commands/spire_startapp_pkg/generator.py,sha256=JEU8-TstU2hiS_zBegWGFuCZ_lyf7P4iedx3hcX2BLA,5915
-django_spire/core/management/commands/spire_startapp_pkg/maps.py,sha256=m0SKcy_TZ4O-mjI74qkxyhVjoDN4QvMmQxgvbbn6mAE,22977
+django_spire/core/management/commands/spire_startapp_pkg/maps.py,sha256=ekgvis2eAhYVQp19F5vM3IS0r0kbts4aPHbJs14c0wE,23228
 django_spire/core/management/commands/spire_startapp_pkg/permissions.py,sha256=czSE-ZNBw-3LsGrtkaD7CBFnitYX18KQjgJ_jjbap7k,5260
 django_spire/core/management/commands/spire_startapp_pkg/processor.py,sha256=zQhuIn2EPU6h-75DrVX8mZOZIBzc5F8GKds8m83QGiA,5900
 django_spire/core/management/commands/spire_startapp_pkg/registry.py,sha256=olBBFvDir6-zOoltQRIzHNIWkRG6CnA1FcP80tU7S3s,2185
 django_spire/core/management/commands/spire_startapp_pkg/reporter.py,sha256=CS8cufg6kQq48A5fO4qIdUNDZWsCriHaW_wqQhzlqUc,10062
 django_spire/core/management/commands/spire_startapp_pkg/resolver.py,sha256=loVIG8zCN_Bo6vjBV2UsUF930Rc5SG5P2klJl3qp0pc,2331
-django_spire/core/management/commands/spire_startapp_pkg/user_input.py,sha256=VUyY9PrqM07vRvgbVJhkC4lgNolnBik3K8S_8U9s_zM,9518
+django_spire/core/management/commands/spire_startapp_pkg/user_input.py,sha256=sj8o-BZw1GMFGRHE91SIG4dODVlJp2_uMXweWcHJb1M,9827
 django_spire/core/management/commands/spire_startapp_pkg/validator.py,sha256=q6fsyRmR1kcN2eAFu-5pDaadJ05FDog7N23eR215Yx0,3322
 django_spire/core/management/commands/spire_startapp_pkg/template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/core/management/commands/spire_startapp_pkg/template/app/__init__.py.template,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -503,7 +503,7 @@ django_spire/core/static/django_spire/css/app-button.css,sha256=iUPOFgXp2v_gsNBe
 django_spire/core/static/django_spire/css/app-default.css,sha256=RLVP_vLlkNx_UpNmMmgO73R3UUB_h3sVHt8I2z_iPVk,315
 django_spire/core/static/django_spire/css/app-import.css,sha256=5jCOcsnTYJsz_pcopA9ssl4nTsBvysjNIH6RVdz1qhU,385
 django_spire/core/static/django_spire/css/app-layout.css,sha256=Wwnbf3tJ3khvTAC2DgzXPtgfR3rWyfMzQ1wljCNsOLo,458
-django_spire/core/static/django_spire/css/app-navigation.css,sha256=2204z23FonCbwNwzk9zc9t9N8fH5rR-H9dPxzU6N7mM,2495
+django_spire/core/static/django_spire/css/app-navigation.css,sha256=_yQ7JCIOoHyOhfpTkj8Q07ma0dFvOMHXTHetnT8-27I,2587
 django_spire/core/static/django_spire/css/app-offcanvas.css,sha256=SxDsONE1eqERJ1gDAP8chjoJ0aD0Q1VHBPqRWJi8-Mw,178
 django_spire/core/static/django_spire/css/app-page.css,sha256=pB-sSZc9NEUkkMcCfzzrCfeiggGmhONn8Eid5HLs8c0,363
 django_spire/core/static/django_spire/css/app-side-panel.css,sha256=ltggQkEc9tswJ9g2M0qzmWprdzycvizrS0YgY2We2U0,1954
@@ -682,7 +682,7 @@ django_spire/core/templates/django_spire/wizard/wizard_page.html,sha256=emW5W2z_
 django_spire/core/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/core/templatetags/json.py,sha256=2XY8hQZrJOSmGMblL8bLRYD9hvUSQvhYaSJvwGaKzwU,280
 django_spire/core/templatetags/message.py,sha256=y70pMv1ddttJ41c11O1S7h7v8h_gTtJVdXe67J4Ld3g,491
-django_spire/core/templatetags/spire_core_tags.py,sha256=YLVqYEnvuJt93CpKoOO7uQ83zsnVnrfstcZthCNNGgA,4020
+django_spire/core/templatetags/spire_core_tags.py,sha256=_IN6HWrscCKJ8LjDRe47y5g1kvBgDAQ7tNAuD5SiuEY,4247
 django_spire/core/templatetags/string_formating.py,sha256=pE5ID0-cvOKfmbAIixVXEW3LN8_XLEF_OlpztHkiILk,444
 django_spire/core/templatetags/variable_types.py,sha256=LFk9NO-LKBTBnXu04jLJ_miOKyuO-KAvqaBM8jwzg7s,686
 django_spire/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1132,8 +1132,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=W1khC2K_EMbEzAFmMxC_P76_MFnkRH4-eVdodrRfAhw,1904
 django_spire/theme/views/page_views.py,sha256=pHr8iekjtR99xs7w1taj35HEo133Svq1dvDD0y0VL1c,3933
-django_spire-0.19.3.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.19.3.dist-info/METADATA,sha256=HyM1bTKoNG0c4GbB1E2fp39YOCHAIUGAa80yjIT9Pwo,4967
-django_spire-0.19.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.19.3.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.19.3.dist-info/RECORD,,
+django_spire-0.19.4.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.19.4.dist-info/METADATA,sha256=1iX3c8liLNuaCp4euBri5oacEIyo1u4Jl44cn6aYh_E,4967
+django_spire-0.19.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.19.4.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.19.4.dist-info/RECORD,,