Merge remote-tracking branch 'origin/main' into wilm

# Conflicts:
#	shopdb/__init__.py

plugins/measuringtools/api/routes.py

@@ -49,7 +49,7 @@ def _merged(tool, today=None):
 # =============================================================================
 
 @measuringtools_bp.route('/types', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def list_types():
     """List measuring-tool types."""
     page, per_page = get_pagination_params(request)
@@ -64,7 +64,7 @@ def list_types():
 
 
 @measuringtools_bp.route('/types/<int:type_id>', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def get_type(type_id: int):
     """Get one measuring-tool type."""
     tool_type = db.session.get(MeasuringToolType, type_id)
@@ -75,7 +75,6 @@ def get_type(type_id: int):
 
 
 @measuringtools_bp.route('/types', methods=['POST'])
-@jwt_required()
 @require_permission('measuringtools.create')
 def create_type():
     """Create a measuring-tool type (reactivates a soft-deleted same-named one)."""
@@ -108,7 +107,6 @@ def create_type():
 
 
 @measuringtools_bp.route('/types/<int:type_id>', methods=['PUT'])
-@jwt_required()
 @require_permission('measuringtools.edit')
 def update_type(type_id: int):
     """Update a measuring-tool type."""
@@ -130,7 +128,6 @@ def update_type(type_id: int):
 
 
 @measuringtools_bp.route('/types/<int:type_id>', methods=['DELETE'])
-@jwt_required()
 @require_permission('measuringtools.delete')
 def delete_type(type_id: int):
     """Delete a measuring-tool type. Refused if any tool still uses it."""
@@ -153,7 +150,7 @@ def delete_type(type_id: int):
 # =============================================================================
 
 @measuringtools_bp.route('', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def list_tools():
     """List measuring tools with filters + pagination.
 
@@ -211,7 +208,7 @@ def list_tools():
 
 
 @measuringtools_bp.route('/<int:tool_id>', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def get_tool(tool_id: int):
     """Get one measuring tool (asset core merged with the extension)."""
     tool = db.session.get(MeasuringTool, tool_id)
@@ -222,7 +219,7 @@ def get_tool(tool_id: int):
 
 
 @measuringtools_bp.route('/by-asset/<int:asset_id>', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def get_tool_by_asset(asset_id: int):
     """Get a measuring tool by its core asset id."""
     tool = MeasuringTool.query.filter_by(assetid=asset_id).first()
@@ -239,7 +236,6 @@ def _asset_type_id():
 
 
 @measuringtools_bp.route('', methods=['POST'])
-@jwt_required()
 @require_permission('measuringtools.create')
 def create_tool():
     """Create a measuring tool: one Asset core row + one extension row."""
@@ -305,7 +301,6 @@ _TOOL_FIELDS = ('measuringtooltypeid', 'calibrationintervaldays',
 
 
 @measuringtools_bp.route('/<int:tool_id>', methods=['PUT'])
-@jwt_required()
 @require_permission('measuringtools.edit')
 def update_tool(tool_id: int):
     """Update a measuring tool (asset core fields + extension in one payload)."""
@@ -357,7 +352,6 @@ def update_tool(tool_id: int):
 
 
 @measuringtools_bp.route('/<int:tool_id>', methods=['DELETE'])
-@jwt_required()
 @require_permission('measuringtools.delete')
 def delete_tool(tool_id: int):
     """Soft delete a measuring tool (deactivates its asset)."""
@@ -377,7 +371,7 @@ def delete_tool(tool_id: int):
 # =============================================================================
 
 @measuringtools_bp.route('/map-overlay', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def map_overlay():
     """Calibration-status overlay for active measuring tools.
 
@@ -408,7 +402,7 @@ def map_overlay():
 # =============================================================================
 
 @measuringtools_bp.route('/report/calibration', methods=['GET'])
-@jwt_required(optional=True)
+@require_permission('measuringtools.view')
 def calibration_report():
     """Counts + lists bucketed by derived calibration status."""
     today = date.today()

plugins/measuringtools/plugin.py

@@ -73,7 +73,9 @@ class MeasuringToolsPlugin(BasePlugin):
                 'name': 'Measuring Tools',
                 'icon': 'ruler',
                 'route': '/measuringtools',
+                'permission': 'measuringtools.view',
                 'position': 22,
+                'section': 'assets',
             },
         ]
 
@@ -85,6 +87,7 @@ class MeasuringToolsPlugin(BasePlugin):
                 'description': 'Measuring tools bucketed by calibration status',
                 'category': 'compliance',
                 'route': '/reports/calibration',
+                'permission': 'measuringtools.view',
             },
         ]