Merge pull request #828 from simonLeary42/settings-export

aebruno · web-flow · commit 46d0ebaa3979 · 2025-10-25T00:21:01.000-04:00
use SETTINGS_EXPORT
diff --git a/coldfront/config/core.py b/coldfront/config/core.py
@@ -57,13 +57,16 @@
 
 SETTINGS_EXPORT += [
     "ALLOCATION_ACCOUNT_ENABLED",
-    "CENTER_HELP_URL",
+    "ALLOCATION_DEFAULT_ALLOCATION_LENGTH",
+    "ALLOCATION_ENABLE_ALLOCATION_RENEWAL",
     "ALLOCATION_EULA_ENABLE",
-    "RESEARCH_OUTPUT_ENABLE",
+    "CENTER_HELP_URL",
     "GRANT_ENABLE",
-    "PUBLICATION_ENABLE",
     "INVOICE_ENABLED",
     "PROJECT_ENABLE_PROJECT_REVIEW",
+    "PROJECT_INSTITUTION_EMAIL_MAP",
+    "PUBLICATION_ENABLE",
+    "RESEARCH_OUTPUT_ENABLE",
 ]
 
 ADMIN_COMMENTS_SHOW_EMPTY = ENV.bool("ADMIN_COMMENTS_SHOW_EMPTY", default=True)
diff --git a/coldfront/config/plugins/system_monitor.py b/coldfront/config/plugins/system_monitor.py
@@ -2,12 +2,17 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-from coldfront.config.base import INSTALLED_APPS
+from coldfront.config.base import INSTALLED_APPS, SETTINGS_EXPORT
 from coldfront.config.env import ENV
 
 INSTALLED_APPS += ["coldfront.plugins.system_monitor"]
 
 SYSTEM_MONITOR_PANEL_TITLE = ENV.str("SYSMON_TITLE", default="HPC Cluster Status")
 SYSTEM_MONITOR_ENDPOINT = ENV.str("SYSMON_ENDPOINT")
-SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK = ENV.str("SYSMON_LINK")
-SYSTEM_MONITOR_DISPLAY_XDMOD_LINK = ENV.str("SYSMON_XDMOD_LINK")
+SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK = ENV.str("SYSMON_LINK", default=None)
+SYSTEM_MONITOR_DISPLAY_XDMOD_LINK = ENV.str("SYSMON_XDMOD_LINK", default=None)
+
+SETTINGS_EXPORT += [
+    "SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK",
+    "SYSTEM_MONITOR_DISPLAY_XDMOD_LINK",
+]
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -107,7 +107,7 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
               <span class="badge badge-warning"><i class="far fa-clock" aria-hidden="true"></i>
                 Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Not renewable
               </span>
-              {% elif is_allowed_to_update_project and ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
+              {% elif is_allowed_to_update_project and settings.ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
                 <a href="{% url 'allocation-renew' allocation.pk %}">
                 <span class="badge badge-warning"><i class="fas fa-redo-alt" aria-hidden="true"></i>
                 Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Click to renew
@@ -477,4 +477,4 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Notificatio
     }
   })
 </script>
-{% endblock %}
+{% endblock %}
diff --git a/coldfront/core/allocation/templates/allocation/allocation_request_list.html b/coldfront/core/allocation/templates/allocation/allocation_request_list.html
@@ -19,7 +19,7 @@ <h2>Allocation Requests</h2>
 </p>
 
 <p class="text-justify"> 
-  By default, activating an allocation will make it active for {{ ALLOCATION_DEFAULT_ALLOCATION_LENGTH }} days.
+  By default, activating an allocation will make it active for {{ settings.ALLOCATION_DEFAULT_ALLOCATION_LENGTH }} days.
 </p>
 
 {% if allocation_list %}
@@ -32,7 +32,7 @@ <h2>Allocation Requests</h2>
           <th scope="col">Project Title</th>
           <th scope="col">PI</th>
           <th scope="col">Resource</th>
-          {% if PROJECT_ENABLE_PROJECT_REVIEW %}
+          {% if settings.PROJECT_ENABLE_PROJECT_REVIEW %}
             <th scope="col" class="text-nowrap">Project Review Status</th>
           {% endif %}
           <th scope="col">Status</th>
@@ -48,7 +48,7 @@ <h2>Allocation Requests</h2>
             <td>{{allocation.project.pi.first_name}} {{allocation.project.pi.last_name}}
               ({{allocation.project.pi.username}})</td>
             <td>{{allocation.get_parent_resource}}</td>
-            {% if PROJECT_ENABLE_PROJECT_REVIEW %}
+            {% if settings.PROJECT_ENABLE_PROJECT_REVIEW %}
               <td class="text-center">{{allocation.project|convert_status_to_icon}}</td>
             {% endif %}
             <td>{{allocation.status}}</td>
diff --git a/coldfront/core/allocation/views.py b/coldfront/core/allocation/views.py
@@ -185,7 +185,6 @@ def get_context_data(self, **kwargs):
         notes = noteset.all() if self.request.user.is_superuser else noteset.filter(is_private=False)
 
         context["notes"] = notes
-        context["ALLOCATION_ENABLE_ALLOCATION_RENEWAL"] = ALLOCATION_ENABLE_ALLOCATION_RENEWAL
         return context
 
     def get(self, request, *args, **kwargs):
@@ -1224,8 +1223,6 @@ def get_context_data(self, **kwargs):
         context["allocation_renewal_dates"] = allocation_renewal_dates
         context["allocation_status_active"] = AllocationStatusChoice.objects.get(name="Active")
         context["allocation_list"] = allocation_list
-        context["PROJECT_ENABLE_PROJECT_REVIEW"] = PROJECT_ENABLE_PROJECT_REVIEW
-        context["ALLOCATION_DEFAULT_ALLOCATION_LENGTH"] = ALLOCATION_DEFAULT_ALLOCATION_LENGTH
         return context
 
 
@@ -1475,7 +1472,6 @@ def get_context_data(self, **kwargs):
             notes = allocation_obj.allocationusernote_set.filter(is_private=False)
 
         context["notes"] = notes
-        context["ALLOCATION_ENABLE_ALLOCATION_RENEWAL"] = ALLOCATION_ENABLE_ALLOCATION_RENEWAL
         return context
 
     def get(self, request, *args, **kwargs):
@@ -1955,7 +1951,6 @@ def get_context_data(self, **kwargs):
             ]
         )
         context["allocation_change_list"] = allocation_change_list
-        context["PROJECT_ENABLE_PROJECT_REVIEW"] = PROJECT_ENABLE_PROJECT_REVIEW
         return context
 
 
diff --git a/coldfront/core/project/templates/project/project_archived_list.html b/coldfront/core/project/templates/project/project_archived_list.html
@@ -86,7 +86,7 @@ <h2>Archived Projects</h2>
               <br> <strong>Description: </strong>{{ project.description }}</td>
             <td>{{ project.field_of_science.description }}</td>
             <td>{{ project.status.name }}</td>
-            {% if PROJECT_INSTITUTION_EMAIL_MAP %}
+            {% if settings.PROJECT_INSTITUTION_EMAIL_MAP %}
                 <p class="card-text text-justify"><strong>Institution: </strong>{{ project.institution }}</p>
             {% endif %}
           </tr>
diff --git a/coldfront/core/project/templates/project/project_detail.html b/coldfront/core/project/templates/project/project_detail.html
@@ -81,7 +81,7 @@ <h3 class="card-title">
           <span class="badge badge-pill badge-info">project review pending</span>
         {% endif %}
     </p>
-    {% if PROJECT_INSTITUTION_EMAIL_MAP %}
+    {% if settings.PROJECT_INSTITUTION_EMAIL_MAP %}
         <p class="card-text text-justify"><strong>Institution: </strong>{{ project.institution }}</p>
     {% endif %}
     <p class="card-text text-justify"><strong>Created: </strong>{{ project.created|date:"M. d, Y" }}</p>
@@ -225,7 +225,7 @@ <h3 class="d-inline"><i class="fas fa-server" aria-hidden="true"></i> Allocation
                 <span class="badge badge-warning"><i class="far fa-clock" aria-hidden="true"></i>
                   Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} <br> Not renewable
                 </span>
-                {% elif is_allowed_to_update_project and ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
+                {% elif is_allowed_to_update_project and settings.ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
                   <a href="{% url 'allocation-renew' allocation.pk %}">
                   <span class="badge badge-warning"><i class="fas fa-redo-alt" aria-hidden="true"></i>
                   Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} <br> Click to renew
diff --git a/coldfront/core/project/templates/project/project_list.html b/coldfront/core/project/templates/project/project_list.html
@@ -71,7 +71,7 @@ <h2>Projects</h2>
             <a href="?order_by=status&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up" aria-hidden="true"></i><span class="sr-only">Sort Status asc</span></a>
             <a href="?order_by=status&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down" aria-hidden="true"></i><span class="sr-only">Sort Status desc</span></a>
           </th>
-          {% if PROJECT_INSTITUTION_EMAIL_MAP %}
+          {% if settings.PROJECT_INSTITUTION_EMAIL_MAP %}
               <th scope="col" class="text-nowrap">
                   Institution
                   <a href="?order_by=id&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up" aria-hidden="true"></i><span class="sr-only">Sort Institution asc</span></a>
@@ -92,7 +92,7 @@ <h2>Projects</h2>
             <td style="text-align: justify; text-justify: inter-word;">{{ project.title }}</td>
             <td>{{ project.field_of_science.description }}</td>
             <td>{{ project.status.name }}</td>
-            {% if PROJECT_INSTITUTION_EMAIL_MAP %}
+            {% if settings.PROJECT_INSTITUTION_EMAIL_MAP %}
                 <td>{{ project.institution }}</td>
             {% endif %}
           </tr>
diff --git a/coldfront/core/project/views.py b/coldfront/core/project/views.py
@@ -215,8 +215,6 @@ def get_context_data(self, **kwargs):
         context["guage_data"] = guage_data
         context["attributes_with_usage"] = attributes_with_usage
         context["project_users"] = project_users
-        context["ALLOCATION_ENABLE_ALLOCATION_RENEWAL"] = ALLOCATION_ENABLE_ALLOCATION_RENEWAL
-        context["PROJECT_INSTITUTION_EMAIL_MAP"] = PROJECT_INSTITUTION_EMAIL_MAP
 
         try:
             context["ondemand_url"] = settings.ONDEMAND_URL
@@ -327,7 +325,6 @@ def get_context_data(self, **kwargs):
 
         context["filter_parameters"] = filter_parameters
         context["filter_parameters_with_order_by"] = filter_parameters_with_order_by
-        context["PROJECT_INSTITUTION_EMAIL_MAP"] = PROJECT_INSTITUTION_EMAIL_MAP
 
         project_list = context.get("project_list")
         paginator = Paginator(project_list, self.paginate_by)
diff --git a/coldfront/core/resource/views.py b/coldfront/core/resource/views.py
@@ -15,7 +15,6 @@
 from django.views.generic import ListView, TemplateView
 from django.views.generic.edit import CreateView
 
-from coldfront.config.core import ALLOCATION_EULA_ENABLE
 from coldfront.core.resource.forms import ResourceAttributeCreateForm, ResourceAttributeDeleteForm, ResourceSearchForm
 from coldfront.core.resource.models import Resource, ResourceAttribute
 
@@ -308,7 +307,6 @@ def get_context_data(self, **kwargs):
 
         context["filter_parameters"] = filter_parameters
         context["filter_parameters_with_order_by"] = filter_parameters_with_order_by
-        context["ALLOCATION_EULA_ENABLE"] = ALLOCATION_EULA_ENABLE
 
         resource_list = context.get("resource_list")
         paginator = Paginator(resource_list, self.paginate_by)
diff --git a/coldfront/plugins/system_monitor/templates/system_monitor/system_monitor_div.html b/coldfront/plugins/system_monitor/templates/system_monitor/system_monitor_div.html
@@ -6,8 +6,8 @@
   <h3 class="text-center">{{system_monitor_panel_title}}</h3>
   <hr> {% if last_updated %}
   <div class="row">
-    {% if SYSTEM_MONITOR_DISPLAY_XDMOD_LINK %}
-    <a target="_blank" href="{{SYSTEM_MONITOR_DISPLAY_XDMOD_LINK}}"><img style="max-width: 100px" src="{% static 'coldfront/plugins/system_monitor/images/xdmod.png' %}" alt=""> <i class="fa fa-external-link" aria-hidden="true"></i></a> {% endif %}
+    {% if settings.SYSTEM_MONITOR_DISPLAY_XDMOD_LINK %}
+    <a target="_blank" href="{{settings.SYSTEM_MONITOR_DISPLAY_XDMOD_LINK}}"><img style="max-width: 100px" src="{% static 'coldfront/plugins/system_monitor/images/xdmod.png' %}" alt=""> <i class="fa fa-external-link" aria-hidden="true"></i></a> {% endif %}
   </div>
   <div class="row">
     <div class="col-lg-6">
@@ -18,10 +18,10 @@ <h3 class="text-center">{{system_monitor_panel_title}}</h3>
     </div>
   </div>
   <div class="row">
-    {% if SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK %}
+    {% if settings.SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK %}
     <div class="col">
-      {% if SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK %}
-      <a target="_blank" href="{{SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK}}">More status info <i class="fa fa-external-link" aria-hidden="true"></i></a>
+      {% if settings.SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK %}
+      <a target="_blank" href="{{settings.SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK}}">More status info <i class="fa fa-external-link" aria-hidden="true"></i></a>
       <br> {% endif %}
     </div>
     {% endif %}
diff --git a/coldfront/plugins/system_monitor/utils.py b/coldfront/plugins/system_monitor/utils.py
@@ -20,10 +20,6 @@ def get_system_monitor_context():
     context["utilization_data"] = system_monitor_data.get("utilization_data")
     context["jobs_data"] = system_monitor_data.get("jobs_data")
     context["system_monitor_panel_title"] = system_monitor_panel_title
-    context["SYSTEM_MONITOR_DISPLAY_XDMOD_LINK"] = import_from_settings("SYSTEM_MONITOR_DISPLAY_XDMOD_LINK", None)
-    context["SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK"] = import_from_settings(
-        "SYSTEM_MONITOR_DISPLAY_MORE_STATUS_INFO_LINK", None
-    )
 
     return context
 
