From 83c9643fd3a3f80b79f5b6262d7fa16b7f9c1c8e Mon Sep 17 00:00:00 2001
From: JhonSGIzquierdo <53907237+MetalPrime@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:57:09 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(Edit=20Interceptor):=20add?=
 =?UTF-8?q?=20superadmin=20permissions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interceptor/project/EditExpectedStudyInterceptor.java  | 7 +++++++
 .../interceptor/project/EditInnovationInterceptor.java     | 7 +++++++
 .../WEB-INF/crp/views/projects/buttons-innovation.ftl      | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditExpectedStudyInterceptor.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditExpectedStudyInterceptor.java
index 88c2c6efa8..70501ab385 100644
--- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditExpectedStudyInterceptor.java
+++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditExpectedStudyInterceptor.java
@@ -206,6 +206,13 @@ void setPermissionParameters(ActionInvocation invocation) throws Exception {
         baseAction.setEditableParameter(false);
       }
 
+      // Allow Superadmin edit
+      if (baseAction.canAccessSuperAdmin() && editParameter) {
+        baseAction.setEditableParameter(true);
+        baseAction.setCanEdit(true);
+        baseAction.setEditStatus(true);
+      }
+
 
     } else {
       throw new NullPointerException();
diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditInnovationInterceptor.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditInnovationInterceptor.java
index 208d6f9f31..41bdff9780 100644
--- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditInnovationInterceptor.java
+++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/interceptor/project/EditInnovationInterceptor.java
@@ -150,6 +150,13 @@ void setPermissionParameters(ActionInvocation invocation) throws Exception {
       baseAction.setCanEdit(canEdit);
       baseAction.setCanSwitchProject(canSwitchProject);
 
+      // Allow Superadmin edit
+      if (baseAction.canAccessSuperAdmin() && editParameter) {
+        baseAction.setEditableParameter(true);
+        baseAction.setCanEdit(true);
+        baseAction.setEditStatus(true);
+      }
+
     } else {
       throw new NullPointerException();
     }
diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/buttons-innovation.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/buttons-innovation.ftl
index a5eef55e87..799adbfca3 100644
--- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/buttons-innovation.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/buttons-innovation.ftl
@@ -23,7 +23,7 @@
       [@logHistory.logList list=recordsList itemName="innovationID" itemId=innovation.id /]
       <a href="" onclick="return false" class="form-button button-history"><span class="glyphicon glyphicon-glyphicon glyphicon-list-alt" aria-hidden="true"></span> [@s.text name="form.buttons.history" /]</a>
     [/#if]
-    [#if (editable && !(transaction??) )]
+    [#if (editable && !(transaction??) ) || editStatus]
       [#-- Discard Button --]
       [@s.submit type="button" cssStyle="display:none" name="cancel" cssClass="button-cancel"]<span class="glyphicon glyphicon-trash" aria-hidden="true"></span> [@s.text name="form.buttons.discard" /] [/@s.submit]