nautobot 1.6.26__py3-none-any.whl → 1.6.28__py3-none-any.whl

nautobot/utilities/tables.py

@@ -1,3 +1,4 @@
+import contextlib
 import django_tables2 as tables
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -88,26 +89,31 @@ class BaseTable(tables.Table):
                     self.columns.hide(column.name)
 
         # Apply custom column ordering for user
+        columns = []
+        pk = self.base_columns.pop("pk", None)
+        actions = self.base_columns.pop("actions", None)
+
         if user is not None and not isinstance(user, AnonymousUser):
             columns = user.get_config(f"tables.{self.__class__.__name__}.columns")
-            if columns:
-                pk = self.base_columns.pop("pk", None)
-                actions = self.base_columns.pop("actions", None)
-
-                for name, column in self.base_columns.items():
-                    if name in columns:
-                        self.columns.show(name)
-                    else:
-                        self.columns.hide(name)
-                self.sequence = [c for c in columns if c in self.base_columns]
-
-                # Always include PK and actions column, if defined on the table
-                if pk:
-                    self.base_columns["pk"] = pk
-                    self.sequence.insert(0, "pk")
-                if actions:
-                    self.base_columns["actions"] = actions
-                    self.sequence.append("actions")
+        if columns:
+            for name, column in self.base_columns.items():
+                if name in columns:
+                    self.columns.show(name)
+                else:
+                    self.columns.hide(name)
+            self.sequence = [c for c in columns if c in self.base_columns]
+
+        # Always include PK and actions column, if defined on the table
+        if pk:
+            with contextlib.suppress(ValueError):
+                self.sequence.remove("pk")
+            self.base_columns["pk"] = pk
+            self.sequence.insert(0, "pk")
+        if actions:
+            with contextlib.suppress(ValueError):
+                self.sequence.remove("actions")
+            self.base_columns["actions"] = actions
+            self.sequence.append("actions")
 
         # Dynamically update the table's QuerySet to ensure related fields are pre-fetched
         if isinstance(self.data, TableQuerysetData):

{nautobot-1.6.26.dist-info → nautobot-1.6.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 1.6.26
+Version: 1.6.28
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0

{nautobot-1.6.26.dist-info → nautobot-1.6.28.dist-info}/RECORD

@@ -113,7 +113,7 @@ nautobot/core/management/commands/celery.py,sha256=wcdq4_Imwk889M-KriUVTWy2SCOX5
 nautobot/core/management/commands/generate_secret_key.py,sha256=hM-l1OmGiBgIauS9-wXYJBzkkpnhezMFgUuxZ5lNwDs,346
 nautobot/core/management/commands/generate_test_data.py,sha256=BP_uVG7RmdYfWeMQZ76kZ-FaRUVH35ACGIqlT_-EQfk,8319
 nautobot/core/management/commands/post_upgrade.py,sha256=-cZy3MXrq4yHGJ2Hh2w4xjcVMm2zf5F490WCNh1GQJA,5518
-nautobot/core/management/commands/pre_migrate.py,sha256=AjrNepSbkJs9_MLW0nSP2wfmYaQdxOnX1dTA1ESrSik,16578
+nautobot/core/management/commands/pre_migrate.py,sha256=myDuwgJL4c9zN2yuMw5oZMZbr-kS4RCQpeGVcQJdVvo,17895
 nautobot/core/management/commands/refresh_content_type_cache.py,sha256=tXryp0RVoQua4jdbcqoX6jCWoKG05c6HlHAIvn4u0A4,1266
 nautobot/core/management/commands/send_installation_metrics.py,sha256=qmr9tWADEcLgSbEGt8P6LRDGeLYutrfml7p4S6W7Wik,3495
 nautobot/core/management/commands/start.py,sha256=LherN1UxKQtDCUAsRNHaz1yqfruWb9D4WIplMj69uno,154
@@ -241,7 +241,7 @@ nautobot/core/tests/test_authentication.py,sha256=SDODgDONxxGTa9_XsN0L9BR4PI_96q
 nautobot/core/tests/test_celery.py,sha256=dCSzVui-nbhHvTSoig8l3mVsEZIGxfWRv-U6lqSQfmk,203
 nautobot/core/tests/test_checks.py,sha256=cZNx-IGpfkwVrYRd3tSL8O6PQWzvDGKhEfr2YPXXw9o,1965
 nautobot/core/tests/test_cli.py,sha256=MDPKPXd-JrRQtWUe7Vsu3r8nmVgoZDbQ3M-MZlgxzcg,1027
-nautobot/core/tests/test_commands.py,sha256=sBXZigdCcf-RWNxP-rPEN96H7punlVv9msRcVZ_OAGQ,3232
+nautobot/core/tests/test_commands.py,sha256=3WeGgnQSYXd96OsdCDBn_HqNqUMTCmclEWEgbCvYqfc,5206
 nautobot/core/tests/test_forms.py,sha256=gO5hPuQ6De2Vp6uGGknk7CutNbnwW1XZ59UqmwTLkSw,447
 nautobot/core/tests/test_graphql.py,sha256=BpPmkQfnzaDbjQV5hJ8U71P-eSZmu9gE-d-zrXzpE1g,91923
 nautobot/core/tests/test_models.py,sha256=KqFIHnByTyYOs9JtssjvBX7AmvCkSb4stlBz_WOzFB8,2319
@@ -568,7 +568,7 @@ nautobot/extras/secrets/__init__.py,sha256=QFU4ROlp1nW3muPSKv39G5hcSmB2NhF3wPlj_
 nautobot/extras/secrets/exceptions.py,sha256=cQXyJrW96wQyg78E3tJ13kFYZkG8OiVjWDwDUcDDixA,1564
 nautobot/extras/secrets/providers.py,sha256=I6llOxIjHcDb13kqFIzkCUWXQDAu39j0WmsD1OFPayA,2942
 nautobot/extras/signals.py,sha256=-1hnV4QT5yGnaeBv_txDLnHm2w-kE9Cqbj7tI9fH03Q,15339
-nautobot/extras/tables.py,sha256=TR7Sl5NdOhOjrX-0FumCImBhCFsrJrGwvGATJvDSc1o,30076
+nautobot/extras/tables.py,sha256=m3z0OC7-dEeaG0Zsm7rUgpcMuWP63YBl5A5J5_SxZPM,30162
 nautobot/extras/tasks.py,sha256=SR99FIg8E4c4f1qocjbYbbGDrMxRe_ZsjHgoGE8mJ7o,6699
 nautobot/extras/templates/django_ajax_tables/ajax_wrapper.html,sha256=ej98qO2zpS-J6SAkdfbLmG7XAFleIF1kt0GqKY7GipE,2097
 nautobot/extras/templates/extras/computedfield.html,sha256=2b2UN8oUf7ow_EWASqU6g4Hht3pNAsAEu20rZVoPhHE,1958
@@ -885,7 +885,7 @@ nautobot/project-static/docs/code-reference/nautobot/apps/filters.html,sha256=at
 nautobot/project-static/docs/code-reference/nautobot/apps/forms.html,sha256=27pblS1OEpu2K5O25a_rMrRbDfUhzD7qUNuGbfjKWBY,369476
 nautobot/project-static/docs/code-reference/nautobot/apps/models.html,sha256=HZHdE3TxDyTJywC4S8FNJ65btiUk0AUSS8qRxGpPnGI,224503
 nautobot/project-static/docs/code-reference/nautobot/apps/secrets.html,sha256=Kzu-cRc-QLJRscjmVmEQKbk1ETyTh3YkHJpuuqHAmpk,103285
-nautobot/project-static/docs/code-reference/nautobot/apps/tables.html,sha256=XAMaExEjOrKkT6341V3Bx6120j6r-TW-6qWoojsO2VE,185338
+nautobot/project-static/docs/code-reference/nautobot/apps/tables.html,sha256=IyRrORic2qbeoqhvgNfgYqjUp8K0tL2b32YILL0gg88,186853
 nautobot/project-static/docs/code-reference/nautobot/apps/testing.html,sha256=KjY2nKY2f2_TiBGfFQRFMBwjx1colcYdZA0t36h-b34,1832855
 nautobot/project-static/docs/code-reference/nautobot/apps/ui.html,sha256=LCvCOq4HNlHxfGs5eniXqjkO-zS8sXrh1M04i-YkyBs,309270
 nautobot/project-static/docs/code-reference/nautobot/apps/urls.html,sha256=xEi2zwsi6fSMQdSQfP2XBVbludViwbAk9Nfk3Q4_oyg,108546
@@ -893,7 +893,7 @@ nautobot/project-static/docs/code-reference/nautobot/apps/utils.html,sha256=JMfd
 nautobot/project-static/docs/code-reference/nautobot/apps/views.html,sha256=Nps9zjGwnIyxciDP74fBhmgkl2ewnNvf4-hnWBgSx1Y,402564
 nautobot/project-static/docs/configuration/authentication/ldap.html,sha256=blc128s_N1f_Qpofy8gkQpDxjiL4NeoM2o1RQ_Jt6RQ,124669
 nautobot/project-static/docs/configuration/authentication/remote.html,sha256=lZgL8php8J0u4meuzLsWIpKPgFO9OJdFTYT4IFNDrrs,90068
-nautobot/project-static/docs/configuration/authentication/sso.html,sha256=1IPrmIm9j6uuYPnSsairXhZLo2pKqgpm4OIuCFbJEnY,151378
+nautobot/project-static/docs/configuration/authentication/sso.html,sha256=q6fErCEUFfGkExM3VBVliwQ37EpsB1IFjhAYDG65ym0,151392
 nautobot/project-static/docs/configuration/index.html,sha256=LLuQfknvncTE0ZLaK_n6A0iMIGRvjAE5hgFhek-8nlw,106547
 nautobot/project-static/docs/configuration/optional-settings.html,sha256=9vP5m_1A8DEo2ScPqeCsSylyb2OzYOqJYbX8i6nOhsA,221823
 nautobot/project-static/docs/configuration/required-settings.html,sha256=52clJ0i0wlYe8TqK8BQs_rax_IxrcCqeTxbB_2yMszc,135007
@@ -1076,14 +1076,14 @@ nautobot/project-static/docs/release-notes/version-1.2.html,sha256=QdkHnyK54mMjo
 nautobot/project-static/docs/release-notes/version-1.3.html,sha256=dae-rrbRyaF5s8oHGCMHPiJVpLUb6alEyqR-YDlnGVI,168543
 nautobot/project-static/docs/release-notes/version-1.4.html,sha256=CkEpfQMtKRqvIZA0CRn1PcD7_JhaNQ-58emphMEk8As,181807
 nautobot/project-static/docs/release-notes/version-1.5.html,sha256=v5zAmW27pEQqBuTs3DkNF7HDLvIqSYYNr5KqBN5zMbw,208157
-nautobot/project-static/docs/release-notes/version-1.6.html,sha256=JuWkFcRuU4IrHnxowCqt6--8MKfcmgN6uF-rrVEVyDM,189213
+nautobot/project-static/docs/release-notes/version-1.6.html,sha256=pfaJxAoE_rf2pnVnorBBQ_RpLTXcXsQa-VAHLjujaHk,193441
 nautobot/project-static/docs/requirements.txt,sha256=v0uo_0GoM3QsvTrLeZVTC6GvKi3Ml7ExH_JMwI8Oxmo,227
 nautobot/project-static/docs/rest-api/authentication.html,sha256=N6R8AxPgk87fUA0mARPbLEOvj1J5YpVBd7bxlf533dY,95769
 nautobot/project-static/docs/rest-api/filtering.html,sha256=3oeK9XKYWvYDGsJO_quoRGENfxpT01VQouWsIijZQzU,102257
 nautobot/project-static/docs/rest-api/overview.html,sha256=_wimramudRVJ5uRoXoCf8mRF7LS9zI6WNQ_Soh4FSqk,210969
-nautobot/project-static/docs/search/search_index.json,sha256=jv9utLV-1nr9GDih89iJTCMdLIKH3LE7XxiPadC-jAA,1988628
-nautobot/project-static/docs/sitemap.xml,sha256=-iHqQdLbiK8ujHpS-WxUwkMjGb3POem2lK8pfZv7otw,37991
-nautobot/project-static/docs/sitemap.xml.gz,sha256=bbc_rhtUSjblalXUlg0LQvEKb6oBARiEck-iqnQSu9Y,1659
+nautobot/project-static/docs/search/search_index.json,sha256=6NrzzFc7xrUZe2TFobWdlLZyHKnOK8BRUjuYQx0VFE0,1990375
+nautobot/project-static/docs/sitemap.xml,sha256=C98XtgWO2hZTC9mDKeQB4k7nv3rk3Rfneept1UViSlU,37991
+nautobot/project-static/docs/sitemap.xml.gz,sha256=R0TdKmqOq2tAQWSBFf8xpG4j9-Y6BRXZCIvofeHh5XQ,1660
 nautobot/project-static/docs/user-guides/custom-fields.html,sha256=sKctOd7DpshtDtm_jhe_qkGluFwX3SXRgogk0GBEEqY,133004
 nautobot/project-static/docs/user-guides/getting-started/creating-devices.html,sha256=bw0xY7tzoGBoE6pj6BsKheIpECHXiKFoIQXWMQhb4LY,93564
 nautobot/project-static/docs/user-guides/getting-started/index.html,sha256=7Z70Shfe_mePKPCEk-RK2Sfq-2SZ7z0Qsqbd-rMx3wE,86948
@@ -1404,7 +1404,7 @@ nautobot/utilities/paginator.py,sha256=BNk0NPVOeeDkdFhNMAm3Je5Y2t4sbd-0LzmbLbvRp
 nautobot/utilities/permissions.py,sha256=gRJDVt2tXB3TSWvbX7lo1euSA1UFXL47AuoE7aluDDE,3384
 nautobot/utilities/query_functions.py,sha256=wfIOaMEe0vJTjbA6UKxiDF6JOc-ZAkJxapOT1YagAOY,2492
 nautobot/utilities/querysets.py,sha256=pg9bPcZ4abPDjYoUgZQw5ByKTekw6n4SQ--VAVeBOyw,3722
-nautobot/utilities/tables.py,sha256=Jch9esrvq3faXXg5fRIdQSdm9CQWaqyJNFcwx_IDOC0,18856
+nautobot/utilities/tables.py,sha256=TvRhPYUQ-nHQGWq8xcRgfLNcvSBVPdK5_RTwTm3yvwg,18986
 nautobot/utilities/tasks.py,sha256=zFYw0bWsrMgejpwmjX34rtAY0sUFhyMmT5bkBnuOF4Y,2073
 nautobot/utilities/templates/buttons/add.html,sha256=EILE_Min5aa55uqdk_RG0RSwDD-lBOfgLvCI6NGy7_M,179
 nautobot/utilities/templates/buttons/clone.html,sha256=MKnjqC-D9ZQhSBjV4cvZNIftJukNwvSdc16jfSBSflY,175
@@ -1509,9 +1509,9 @@ nautobot/virtualization/tests/test_models.py,sha256=O8mu0GB9gztj098FKTbRAaEi1Nwy
 nautobot/virtualization/tests/test_views.py,sha256=tAHLjoVmF0N20dM-7o1NPqW1UgyeIBRbw1CKZEneYKo,14456
 nautobot/virtualization/urls.py,sha256=F9lwHTuqORxJepRStGF7ZasDhQ7aD8cRQ-Mp_feY3YA,8162
 nautobot/virtualization/views.py,sha256=uACV3h2vOWm4ui14zX2cFNX6qs0_Jd5EfMvtLYV4EW0,15649
-nautobot-1.6.26.dist-info/LICENSE.txt,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
-nautobot-1.6.26.dist-info/METADATA,sha256=w1iaKL4iWUrOR44ZK0NzZS9VABPVQw9bu4FyZO3H7JA,9624
-nautobot-1.6.26.dist-info/NOTICE,sha256=2uSWs7KDIfOWAPxOGR_FdTW_41Zd4FTKGWXCqKZv2x4,267
-nautobot-1.6.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nautobot-1.6.26.dist-info/entry_points.txt,sha256=kUwm_Ve_FyUFjcYqTtQWsqJ2JKWPkHFOD8rcK71jX2k,58
-nautobot-1.6.26.dist-info/RECORD,,
+nautobot-1.6.28.dist-info/LICENSE.txt,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
+nautobot-1.6.28.dist-info/METADATA,sha256=zPuie2-yU80dL_XQRin0dmI4F2G2g4BTNJuLVuqv1fE,9624
+nautobot-1.6.28.dist-info/NOTICE,sha256=2uSWs7KDIfOWAPxOGR_FdTW_41Zd4FTKGWXCqKZv2x4,267
+nautobot-1.6.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nautobot-1.6.28.dist-info/entry_points.txt,sha256=kUwm_Ve_FyUFjcYqTtQWsqJ2JKWPkHFOD8rcK71jX2k,58
+nautobot-1.6.28.dist-info/RECORD,,