diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index 896f00b727..865c4f9a30 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -1,6 +1,6 @@ ch.ivy.addon.portal.generic: CaseDetailsTemplate: - noCaseId: No case-Id specified + noCaseFound: Case not found or you don't have permission to view this case. requestTabTitle: Request statusTabTitle: Case Information OpenTaskTemplate: diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index d1f85cba9f..0267078871 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -1,6 +1,6 @@ ch.ivy.addon.portal.generic: CaseDetailsTemplate: - noCaseId: Keine Vorgangs-ID spezifiziert + noCaseFound: Fall nicht gefunden oder Sie haben keine Berechtigung, diesen Fall zu sehen. requestTabTitle: Anfrage statusTabTitle: Vorgangsinformationen OpenTaskTemplate: diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index edcfc633ea..aee201428b 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -1,6 +1,6 @@ ch.ivy.addon.portal.generic: CaseDetailsTemplate: - noCaseId: No case-Id specified + noCaseFound: Case not found or you don't have permission to view this case. requestTabTitle: Request statusTabTitle: Case Information OpenTaskTemplate: diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index 5f54bd1989..f74b3738de 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,6 +1,6 @@ ch.ivy.addon.portal.generic: CaseDetailsTemplate: - noCaseId: No hay ID de caso especificado + noCaseFound: Caso no encontrado o no tienes permiso para ver este caso. requestTabTitle: Solicitud statusTabTitle: Información del caso OpenTaskTemplate: diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index cad0ec2d68..5341943639 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,6 +1,6 @@ ch.ivy.addon.portal.generic: CaseDetailsTemplate: - noCaseId: Aucun numéro de dossier n'a été indiqué + noCaseFound: Cas non trouvé ou vous n'avez pas la permission de voir ce cas. requestTabTitle: Demande statusTabTitle: Informations sur le dossier OpenTaskTemplate: diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java index 5fbf065d0b..d02d42b241 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java @@ -159,7 +159,7 @@ private int getFirstTerminatingStageIndex(List stages) { } public void generateCaseDetailInFrame(ICase currentCase) { - setCaseDetailsLink(PortalNavigator.buildPortalCaseDetailInFrameUrl(currentCase.uuid())); + setCaseDetailsLink(PortalNavigator.buildPortalCaseDetailInFrameUrl(currentCase != null ? currentCase.uuid() : null)); } public Long getIntervalForPollingWhenOpenCaseDetails() { diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml index 21f9cc4a85..402dd8c7b4 100644 --- a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml @@ -160,14 +160,14 @@ - - +