Separate Facilities

JeffersonLab · Jan 28, 2025 · f4fb785 · f4fb785
1 parent 5c8191c
commit f4fb785
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
@@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("paginator", paginator);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/permissions/authorization-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/history/beam-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/...java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/...java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -64,7 +64,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/permissions/destinations-authorization-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/history/destinations-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/.../webapp/WEB-INF/tags/permissions-page.tag → ...app/WEB-INF/tags/authorizations-panel.tag b/.../webapp/WEB-INF/tags/permissions-page.tag → ...app/WEB-INF/tags/authorizations-panel.tag
@@ -35,7 +35,7 @@
                 <c:choose>
                     <c:when test="${not empty beamList}">
                         <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-                        <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
+                        <t:beam-operations-table beamList="${beamList}" isHistory="${isHistory}"/>
                         <h3>Notes</h3>
                         <div class="notes-field">
             <span class="readonly-field">

diff --git a/...NF/tags/destination-permissions-table.tag → ...pp/WEB-INF/tags/beam-operations-table.tag b/...NF/tags/destination-permissions-table.tag → ...pp/WEB-INF/tags/beam-operations-table.tag
diff --git a/...ebapp/WEB-INF/tags/authorization-page.tag → ...INF/tags/facility-authorizations-page.tag b/...ebapp/WEB-INF/tags/authorization-page.tag → ...INF/tags/facility-authorizations-page.tag
diff --git a/src/main/webapp/WEB-INF/views/facility-authorization.jsp b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:authorization-page title="${facility.name}">
+<t:facility-authorizations-page title="${facility.name}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
     </jsp:attribute>
@@ -13,7 +13,7 @@
     </jsp:attribute>        
     <jsp:body>
         <section>
-            <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
+            <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
         </section>
         <div id="success-dialog" class="dialog" title="Authorization Saved Successfully">
             <span class="logentry-success">A new log entry was created: <a id="new-entry-url" href="#"></a></span>
@@ -22,4 +22,4 @@
             </div>
         </div>
     </jsp:body>         
-</t:authorization-page>
+</t:facility-authorizations-page>
diff --git a/...ews/permissions/authorization-history.jsp → ...pp/WEB-INF/views/history/beam-history.jsp b/...ews/permissions/authorization-history.jsp → ...pp/WEB-INF/views/history/beam-history.jsp
diff --git a/...ns/destinations-authorization-history.jsp → ...NF/views/history/destinations-history.jsp b/...ns/destinations-authorization-history.jsp → ...NF/views/history/destinations-history.jsp
@@ -28,7 +28,7 @@
         <section>
             <c:choose>
                 <c:when test="${beamAuthorization ne null}">
-                    <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
+                    <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
                 </c:when>
                 <c:otherwise>
                     <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.beamAuthorizationId)}</div>