Merge pull request #304 from usnistgov/7.3.1.dev

7.3.1.dev

Author: rptmat57

Dockerfile.splash_pad

@@ -1,5 +1,7 @@
 FROM python:3.13
 
+ENV PIP_ROOT_USER_ACTION=ignore
+
 RUN apt-get update && apt-get upgrade -y && apt-get install -y systemctl rsync vim less
 
 COPY . /nemo/

NEMO/apps/kiosk/templates/kiosk/tool_report_problem.html

@@ -90,7 +90,7 @@ <h4>{{ message }}</h4>
                 <span style="padding-left:10px;">This problem represents a safety hazard to the {{ facility_name }} and should be regarded as urgent.Notify the {{ facility_name }} safety officer of this issue.</span>
             </label>
         </div>
-        {% if tool.problem_shutdown_enabled %}
+        {% if tool.problem_shutdown_enabled or customer|is_staff_on_tool:tool %}
             <div class="checkbox">
                 <label>
                     <input name="force_shutdown"

NEMO/context_processors.py

@@ -91,7 +91,7 @@ def base_context(request):
         "access_user_request_allowed_exist": access_user_request_allowed_exist,
         "adjustment_request_allowed": adjustment_request_allowed == "enabled"
         or adjustment_request_allowed == "reviewers_only"
-        and user
+        and isinstance(user, User)
         and user.is_adjustment_request_reviewer,
         "staff_assistance_request_allowed": customization_values.get("staff_assistance_requests_enabled", "")
         == "enabled",

NEMO/forms.py

@@ -49,6 +49,7 @@
     UserPreferences,
 )
 from NEMO.policy import policy_class as policy
+from NEMO.templatetags.custom_tags_and_filters import is_staff_on_tool
 from NEMO.utilities import (
     RecurrenceFrequency,
     bootstrap_primary_color,
@@ -178,7 +179,7 @@ def clean(self):
                     "This task can't be resolved because it is marked as 'cancelled' or 'resolved' already."
                 )
         tool = cleaned_data.get("tool")
-        if tool and not tool.problem_shutdown_enabled:
+        if tool and not tool.problem_shutdown_enabled and not is_staff_on_tool(self.user, tool):
             cleaned_data["force_shutdown"] = False
         return cleaned_data
 

NEMO/migrations/0137_area_nemo_area_tree_id_lft_idx.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.27 on 2026-01-07 23:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0136_tool__requires_area_occupancy_minimum"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="area",
+            index=models.Index(fields=["tree_id", "lft"], name="NEMO_area_tree_id_lft_idx"),
+        ),
+    ]

NEMO/templates/maintenance/pending_task_details.html

@@ -121,7 +121,7 @@ <h2>{{ task.tool.name }} task</h2>
             </div>
             <div class="form-group">
                 <div class="col-lg-12">
-                    {% if task.tool.problem_shutdown_enabled %}
+                    {% if task.tool.problem_shutdown_enabled or user|is_staff_on_tool:task.tool %}
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" name="force_shutdown" {% if task.force_shutdown %}checked{% endif %}>

NEMO/templates/tasks/resolve.html

@@ -23,7 +23,7 @@ <h4>Resolve the task</h4>
                 <input type="hidden"
                        name="estimated_resolution_time"
                        value="{{ estimated_resolution_time|input_date_format }}">
-                {% if task.tool.problem_shutdown_enabled %}
+                {% if task.tool.problem_shutdown_enabled or user|is_staff_on_tool:task.tool %}
                     <input type="hidden" name="force_shutdown" value="{{ task.force_shutdown }}">
                 {% endif %}
                 <input type="hidden" name="safety_hazard" value="{{ task.safety_hazard }}">

NEMO/templates/tasks/update.html

@@ -78,7 +78,7 @@ <h4>Update the task</h4>
                     </script>
                 </div>
                 <div class="form-group">
-                    {% if task.tool.problem_shutdown_enabled %}
+                    {% if task.tool.problem_shutdown_enabled or user|is_staff_on_tool:task.tool %}
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" name="force_shutdown" {% if task.force_shutdown %}checked{% endif %}>

NEMO/templates/tool_control/tool_status.html

@@ -1050,7 +1050,7 @@ <h4 class="media-heading">Tool properties</h4>
                         This problem represents a <b>safety hazard</b> to the {{ facility_name }} and should be regarded as urgent. Notify the {{ facility_name }} safety officer of this issue.
                     </label>
                 </div>
-                {% if tool.problem_shutdown_enabled %}
+                {% if tool.problem_shutdown_enabled or user|is_staff_on_tool:tool %}
                     <div class="checkbox">
                         <label>
                             <input name="force_shutdown" id="force_shutdown" type="checkbox" />

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "NEMO"
-version = "7.3.0"
+version = "7.3.1"
 description = "NEMO is a laboratory logistics web application. Use it to schedule reservations, control tool access, track maintenance issues, and more."
 keywords = ["NEMO"]
 readme = "README.md"