Merge pull request #125 from djhoward12/djhoward12-naaps-122-exclude-…

…form-fields adding exclude to floorplantile form
nautobot · Sep 18, 2024 · a6b695b · a6b695b
2 parents be6e94b + b6d0d30
commit a6b695b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/changes/122.fixed b/changes/122.fixed
@@ -0,0 +1 @@
+Excluded internal `allocation_type` and `on_group_tile` fields from Floor Plan Tile add/edit form.
diff --git a/changes/125.housekeeping b/changes/125.housekeeping
@@ -0,0 +1 @@
+Removed import button from Navigation bar.
diff --git a/nautobot_floor_plan/forms.py b/nautobot_floor_plan/forms.py
@@ -182,6 +182,7 @@ class Meta:
 
         model = models.FloorPlanTile
         fields = "__all__"
+        exclude = ["allocation_type", "on_group_tile"] # pylint: disable=modelform-uses-exclude
 
     def __init__(self, *args, **kwargs):
         """Overwrite the constructor to define grid numbering style."""

diff --git a/nautobot_floor_plan/navigation.py b/nautobot_floor_plan/navigation.py
@@ -1,6 +1,6 @@
 """Menu items."""
 
-from nautobot.apps.ui import NavMenuAddButton, NavMenuGroup, NavMenuImportButton, NavMenuItem, NavMenuTab
+from nautobot.apps.ui import NavMenuAddButton, NavMenuGroup, NavMenuItem, NavMenuTab
 
 menu_items = (
     NavMenuTab(
@@ -19,10 +19,6 @@
                                 link="plugins:nautobot_floor_plan:floorplan_add",
                                 permissions=["nautobot_floor_plan.add_floorplan"],
                             ),
-                            NavMenuImportButton(
-                                link="plugins:nautobot_floor_plan:floorplan_import",
-                                permissions=["nautobot_floor_plan.add_floorplan"],
-                            ),
                         ),
                     ),
                 ),

diff --git a/nautobot_floor_plan/tables.py b/nautobot_floor_plan/tables.py
@@ -44,7 +44,9 @@ class Meta(BaseTable.Meta):
             "x_size",
             "y_size",
             "x_origin_seed",
+            "x_axis_step",
             "y_origin_seed",
+            "y_axis_step",
             "tile_width",
             "tile_depth",
             "tags",
@@ -54,6 +56,14 @@ class Meta(BaseTable.Meta):
             "pk",
             "floor_plan",
             "location",
+            "x_size",
+            "y_size",
+            "x_origin_seed",
+            "x_axis_step",
+            "y_origin_seed",
+            "y_axis_step",
+            "tile_width",
+            "tile_depth",
             "tags",
             "actions",
         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Excluded internal `allocation_type` and `on_group_tile` fields from Floor Plan Tile add/edit form.