KFSPTS-32444 Fix editing of IWNT Proc Assistant NetID (#1640)

CU-CommunityApps · Aug 26, 2024 · ca24356 · ca24356
1 parent 667c56a
commit ca24356
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...ain/java/edu/cornell/kfs/module/purap/document/authorization/IWantDocumentAuthorizer.java b/...ain/java/edu/cornell/kfs/module/purap/document/authorization/IWantDocumentAuthorizer.java
@@ -80,6 +80,10 @@ public Set<String> getEditModes(Document document, Person user, Set<String> edit
             result.remove(CUPurapConstants.IWNT_DOC_RETURN_TO_SSC);
         }
 
+        if (!canEditProcurementAssistantNetId(user)) {
+            result.remove(CUPurapConstants.I_WANT_DOC_EDIT_PROCUREMENT_ASSISTANT_NET_ID);
+        }
+
         return result;
     }
 
@@ -209,6 +213,10 @@ private boolean isInProcurementAssistantNode(Document document) {
         return false;
     }
 
+    private boolean canEditProcurementAssistantNetId(Person currentUser) {
+        return isCurrentUserProcurementContractAssistant(currentUser);
+    }
+
     private boolean isCurrentUserInRole(String namespace, String roleName, Person currentUser) {
         List<String> roleIds = new ArrayList<String>();
         roleIds.add(getRoleService().getRoleIdByNamespaceCodeAndName(namespace, roleName));

diff --git a/.../cornell/kfs/module/purap/document/authorization/IWantDocumentPresentationController.java b/.../cornell/kfs/module/purap/document/authorization/IWantDocumentPresentationController.java
@@ -13,6 +13,7 @@
 import org.kuali.kfs.sys.service.impl.KfsParameterConstants;
 
 import edu.cornell.kfs.module.purap.CUPurapConstants;
+import edu.cornell.kfs.module.purap.CUPurapConstants.IWantRouteNodes;
 import edu.cornell.kfs.module.purap.CUPurapParameterConstants;
 import edu.cornell.kfs.module.purap.document.IWantDocument;
 import edu.cornell.kfs.sys.CUKFSConstants;
@@ -148,13 +149,15 @@ public Set<String> getEditModes(Document document) {
         }
 
         editModes.add(CUPurapConstants.I_WANT_DOC_EDIT_PROC_NET_ID);
-        editModes.add(CUPurapConstants.I_WANT_DOC_EDIT_PROCUREMENT_ASSISTANT_NET_ID);
         editModes.add(CUPurapConstants.IWNT_DOC_DISPLAY_NOTE_OPTIONS);
 
         if (isContractFunctionalityEnabled()) {
             editModes.add(CUPurapConstants.IWNT_DOC_DISPLAY_CONTRACT_TAB);
             editModes.add(CUPurapConstants.IWNT_DOC_EDIT_CONTRACT_INDICATOR);
-
+            if (workflowDocument.isEnroute() && workflowDocument.getCurrentNodeNames().contains(
+                    IWantRouteNodes.PROCUREMENT_CONTRACT_ASSISTANT)) {
+                editModes.add(CUPurapConstants.I_WANT_DOC_EDIT_PROCUREMENT_ASSISTANT_NET_ID);
+            }
         }
 
         return editModes;

diff --git a/src/main/webapp/WEB-INF/tags/module/purap/iWantContract.tag b/src/main/webapp/WEB-INF/tags/module/purap/iWantContract.tag
@@ -8,8 +8,8 @@
 <c:set var="displayContractTab" value="${(not empty KualiForm.editingMode['displayContractTab'])}" scope="request"/>
 <c:set var="contractIndicatorReadOnly" value="${(empty KualiForm.editingMode['editContractIndicator'])}" scope="request"/>
 <c:set var="docEnroute" value="${KualiForm.docEnroute}"/>
-<c:set var="canEditProcessingAssistantNetId" value="${(not empty KualiForm.editingMode['editProcurementAssistantNetId'])}" scope="request"/>
-<c:set var="procurementAssistantNetIdReadOnly" value="${!fullEntryMode || !canEditProcessingAssistantNetId || !docEnroute}" scope="request"/>
+<c:set var="canEditProcurementAssistantNetId" value="${(not empty KualiForm.editingMode['editProcurementAssistantNetId'])}" scope="request"/>
+<c:set var="procurementAssistantNetIdReadOnly" value="${!fullEntryMode || !canEditProcurementAssistantNetId || !docEnroute}" scope="request"/>
 
 <c:if test="${displayContractTab}">
     <kul:tab tabTitle="Jaggaer Contract" defaultOpen="true">