Merge pull request #1059 from axonivy-market/bug/IVYPORTAL-17273-Mani…

…pulate-expiry-in-task-detail-in-portal-doesn-t-produce-correct-behaviour-LE

IVYPORTAL-17273 Manipulate expiry in task detail in portal doesn't pr…

AxonIvyPortal/PortalTest/src_test/portal/guitest/test/TaskDetailsTest.java

@@ -94,7 +94,6 @@ public void testChangeTaskDeadlineWithAfterEscalationIsNA() {
     assertTrue(StringUtils.equalsIgnoreCase(prepareTomorrowAsLocaleDateString(now), taskDetailsPage.getExpiryOfTaskAt()));
     String firstTaskNoteComment = taskDetailsPage.getFirstTaskNoteComment();
     assertTrue(StringUtils.contains(firstTaskNoteComment, "Portal Admin User (admin) has set deadline to task"));
-    assertTrue(StringUtils.contains(firstTaskNoteComment, "assign Everybody as the task escalation activator"));
   }
 
   @Test

AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemGeneralInfo/TaskItemGeneralInfoProcess.p.json

@@ -61,9 +61,12 @@
             "import ch.ivyteam.ivy.security.IUser;",
             "import ch.ivy.addon.portalkit.service.TaskInforActionService;",
             "",
-            "// Behind the scene, Portal sets expiry activator to the current responsible then set expiry time.",
+            "// Behind the scene, Portal sets expiry activator to the current responsible",
+            "// then set expiry time in case the task has expiry handler.",
             "boolean isUpdateExpiryActivator = false;",
-            "if (in.task.getExpiryActivator() == null) {",
+            "if (in.task.getExpiryActivator() == null &&",
+            "  StringUtils.isNotBlank(in.task.getExpiryTaskStartElementPid())) {",
+            "",
             "  in.task.setExpiryActivator(in.task.getActivator());",
             "  isUpdateExpiryActivator = true;",
             "}",