diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailItem.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailItem.java index 9a436ed1341756876980ae1e02f48c92201cda3f..b79f7a0145e7381825dc79d61a430da5d93ee108 100644 --- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailItem.java +++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailItem.java @@ -104,6 +104,8 @@ public abstract class SAPResultDetailItem implements Comparable<SAPResultDetailI public abstract void setComment(String comment); + public abstract boolean containsUnderlyingFilterType(String type); + public List<TestInstance> getInstances(Status status) { if (LOG.isDebugEnabled()) { LOG.debug("getInstances"); diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailMetaTestItem.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailMetaTestItem.java index e0db5c46f5c88a8afd40bc49598fffe328a2e97e..a0548e872fa8e61095f7912799e57d12c9d640c7 100644 --- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailMetaTestItem.java +++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailMetaTestItem.java @@ -166,4 +166,16 @@ public class SAPResultDetailMetaTestItem extends SAPResultDetailItem { } // noop } + + @Override + public boolean containsUnderlyingFilterType(String type){ + if (LOG.isDebugEnabled()) { + LOG.debug("containsUnderlyingFilterType"); + } + for (TestRoles testRole : testRoles){ + if(testRole.getTest().getTestType().getKeyword().equals(type)) + return true; + } + return false; + } } diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailTestRoleItem.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailTestRoleItem.java index 1f25b23845d700d3c7c143d266640f7a1135244f..1a172f2d3255ab5c493560275f5acf9b15a0c303 100644 --- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailTestRoleItem.java +++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/bean/SAPResultDetailTestRoleItem.java @@ -212,4 +212,12 @@ public class SAPResultDetailTestRoleItem extends SAPResultDetailItem { EntityManagerService.provideEntityManager().persist(commentEntity); EntityManagerService.provideEntityManager().flush(); } + + @Override + public boolean containsUnderlyingFilterType(String type) { + if (LOG.isDebugEnabled()) { + LOG.debug("containsUnderlyingFilterType"); + } + return false; + } } diff --git a/gazelle-tm-war/pom.xml b/gazelle-tm-war/pom.xml index 2c19793d9a5b5124e7b5c08d9d6e2dae4ad39920..462258bfe8c92b52d7c0f8f96009cc66fcdf603f 100644 --- a/gazelle-tm-war/pom.xml +++ b/gazelle-tm-war/pom.xml @@ -11,7 +11,7 @@ <packaging>war</packaging> <properties> <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format> - <gazelle-assets-version>3.0.0</gazelle-assets-version> + <gazelle-assets-version>3.0.2</gazelle-assets-version> </properties> <build> <pluginManagement> diff --git a/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/de/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index d41761cfeca274cc52a91d9cf538507fe5492eb2..8dd7f811ffcce6a0d79cf6d153ca9faeb8890627 100644 --- a/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/en/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/es-ES/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/fi/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.cas-client-ui-v7/messages.properties index a61f647d56cc9f43847f7bcd6c1e8c176464fdc2..eb3bfada61afe61c0193ae8d735df027616b2ba4 100644 --- a/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=S'identifier net.ihe.gazelle.ssoclient.Logout=D\u00E9connexion +net.ihe.gazelle.ssoclient.SignUp=S'enregistrer +net.ihe.gazelle.ssoclient.manageUsers=G\u00E9rer les utilisateurs +net.ihe.gazelle.ssoclient.myAccount=Mon compte diff --git a/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 2350ac151082e115d9fd74acb7bdcaa31d73e95f..a6f3cccdbfb8061e05c909ca507bbaedff609eaa 100644 --- a/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/fr/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Param\u00E9trage de l'application gazelle.common.application.ApplicationHomePath=Chemin vers la page d'accueil de l'application gazelle.common.application.ApplicationOID=OID de l'application @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=D\u00E9sapprouver toutes les configurations net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=Vous avez \u00E9t\u00E9 d\u00E9connect\u00E9 de Gazelle net.ihe.gazelle.tm.Discount=Remise net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Afficher les erreurs Jira en rapport avec ce test diff --git a/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..0c978efaa600ee917b6c42d9612c4ff60447eb68 100644 --- a/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 -net.ihe.gazelle.ssoclient.Login=Log in -net.ihe.gazelle.ssoclient.Logout=Log out +#Thu Oct 31 14:17:28 CET 2024 +net.ihe.gazelle.ssoclient.Login=Accedere +net.ihe.gazelle.ssoclient.Logout=Uscire +net.ihe.gazelle.ssoclient.SignUp=Iscriviti +net.ihe.gazelle.ssoclient.manageUsers=Gestire gli utenti +net.ihe.gazelle.ssoclient.myAccount=Mio account diff --git a/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 790e67ca44157e49ec0ae95f71ceb44db269df16..879b8a7be57fbaa26cd89b98b19b19e3a29ea88c 100644 --- a/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/it/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index be9991299f24869e39cc05f80b74b2de5d4a861c..98ae198ad1691f24d6045af9eda64e2cf0591e01 100644 --- a/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/ja/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30DB\u30FC\u30E0\u30D1\u30B9 gazelle.common.application.ApplicationOID=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3 OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=\u514D\u8CAC\u4E8B\u9805 +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=\u8A3C\u660E\u66F8\u30E1\u30CB\u30E5\u30FC\u306E\u8868\u793A net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Jira \u8AB2\u984C\u306B\u95A2\u9023\u3059\u308B\u30C6\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002 diff --git a/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/pl/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/sv-SE/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index f3261697ac5207812ef9ad87c678c585c03167b5..a624d1e9ddc854b6da29bc757bcf941b294b88da 100644 --- a/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/zh-CN/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.cas-client-ui-v7/messages.properties b/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.cas-client-ui-v7/messages.properties index 3f5a69782499f315e75582896b179ea24be4efa0..289c3f56fc85f94f2d574760bddfd7088bc66a78 100644 --- a/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.cas-client-ui-v7/messages.properties +++ b/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.cas-client-ui-v7/messages.properties @@ -1,4 +1,7 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 net.ihe.gazelle.ssoclient.Login=Log in net.ihe.gazelle.ssoclient.Logout=Log out +net.ihe.gazelle.ssoclient.SignUp=Sign up +net.ihe.gazelle.ssoclient.manageUsers=Manage users +net.ihe.gazelle.ssoclient.myAccount=My account diff --git a/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties b/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties index 244d4a7093d17e9d80fcc73cd17bfe8e6160cdd5..703f13aacec6a03202288f5666ffc6bbf045bea4 100644 --- a/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties +++ b/gazelle-tm-war/src/main/crowdin/zh-TW/net.ihe.gazelle.tm.gazelle-tm-war/tm.properties @@ -1,5 +1,5 @@ #This file is automatically generated. Please do not edit this file. If you'd like to change the content please use crowdin -#Tue Oct 15 09:05:18 CEST 2024 +#Thu Oct 31 14:17:28 CET 2024 gazelle.common.ConfigureApplication=Configure application gazelle.common.application.ApplicationHomePath=Application Home Path gazelle.common.application.ApplicationOID=Application OID @@ -2157,6 +2157,7 @@ net.ihe.gazelle.tm.DisableUserAccount=Deactivate user account net.ihe.gazelle.tm.Disabled=Deactivate net.ihe.gazelle.tm.DisapprovalOfTheConfiguration=Disapproval of the configuration net.ihe.gazelle.tm.Disclaimer=Disclaimer +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. net.ihe.gazelle.tm.Discount=Discount net.ihe.gazelle.tm.DisplayCertificatesMenu=Display Certificates menu net.ihe.gazelle.tm.DisplayJiraIssuesRelatedToTest=Display jira issues related to test diff --git a/gazelle-tm-war/src/main/messages/tm.properties b/gazelle-tm-war/src/main/messages/tm.properties index aefd97eeb4e18d606c659f59561151fb21fa5c42..bdba8664141e6324fff1fcc1b76022f35404fecd 100644 --- a/gazelle-tm-war/src/main/messages/tm.properties +++ b/gazelle-tm-war/src/main/messages/tm.properties @@ -3388,4 +3388,5 @@ net.ihe.gazelle.tm.CancelRunButton=Cancel net.ihe.gazelle.tm.CancelButtonTitle=Cancel test step run net.ihe.gazelle.tm.GetRunResult=Get result net.ihe.gazelle.tm.RefreshToGetResult=Refresh page to see if step run is completed -net.ihe.gazelle.tm.TestIsRunningMessage=Automated test execution is in progress. <br/> Click on "Get Result" button to refresh the status. \ No newline at end of file +net.ihe.gazelle.tm.TestIsRunningMessage=Automated test execution is in progress. <br/> Click on "Get Result" button to refresh the status. +net.ihe.gazelle.tm.DisconnectedFromSession=You have been disconnected from Gazelle. \ No newline at end of file diff --git a/gazelle-tm-war/src/main/webapp/WEB-INF/web.xml b/gazelle-tm-war/src/main/webapp/WEB-INF/web.xml index 801d29c1b83cc18be7a06ac05fefe182ff26525b..9ce4a08e8c518f4a30c2b5ec39d13b3110e2a305 100644 --- a/gazelle-tm-war/src/main/webapp/WEB-INF/web.xml +++ b/gazelle-tm-war/src/main/webapp/WEB-INF/web.xml @@ -69,6 +69,23 @@ <session-config> <session-timeout>20</session-timeout> </session-config> + <!-- Encoding --> + <filter> + <filter-name>SetCharacterEncoding</filter-name> + <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class> + <init-param> + <param-name>encoding</param-name> + <param-value>UTF-8</param-value> + </init-param> + <init-param> + <param-name>ignore</param-name> + <param-value>false</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>SetCharacterEncoding</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <!-- seam --> <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> diff --git a/gazelle-tm-war/src/main/webapp/layout/template.xhtml b/gazelle-tm-war/src/main/webapp/layout/template.xhtml index 8a99daf61c2d80f87e7d3838996dd8f218bad9b2..bc6c1c2f13e0b267101654593ac4142e15f862b3 100644 --- a/gazelle-tm-war/src/main/webapp/layout/template.xhtml +++ b/gazelle-tm-war/src/main/webapp/layout/template.xhtml @@ -136,26 +136,21 @@ <span id="deployCountdown"/> </div> - <div id="logoutScheduled" class="schedule-invisible"><span><h:form id="ls"> - <s:token allowMultiplePosts="true"/> - <h:outputText value="#{messages['gazelle.tm.logout.scheduled']}"/> - : <span id="lougoutCountdown"/> - - <a4j:commandButton id="bt" styleClass="gzl-btn-green btn-sm" - value="#{messages['net.ihe.gazelle.tm.StayConnected']}" - actionListener="#{userManagerExtra.userDoneAction()}" - onclick="stopCountDownLogout()"> - </a4j:commandButton> - </h:form> - </span> + <div id="logoutScheduled" class="schedule-invisible"> + <span> + <h:outputLink rendered="${preferenceProvider.getBoolean('cas_enabled')}" id="reloginButton" + value="#{preferenceProvider.getString('application_url')}/login/login.seam"> + <h:outputText value="#{messages['net.ihe.gazelle.tm.DisconnectedFromSession']}"/> + <f:param name="request" value="#{request.requestURL}" disable="#{request.queryString != null}"/> + <f:param name="request" value="#{request.requestURL}?#{request.queryString}" + disable="#{request.queryString == null}"/> + </h:outputLink> + </span> </div> <div id="deployExecuted" class="schedule-invisible"><span><h:outputText value="#{messages['net.ihe.gazelle.tm.redeployed']}"/></span></div> - <div id="logoutExecuted" class="schedule-invisible"><span><h:outputText - value="#{messages['net.ihe.gazelle.tm.loggedout']}"/></span></div> - <div id="jbossRestarted" class="schedule-invisible"><span><h:outputText value="#{messages['net.ihe.gazelle.tm.TheServerIsRestartingAnyChangeWillBeLost']}"/></span> </div> diff --git a/gazelle-tm-war/src/main/webapp/testing/results/connectathonResultsDetails.xhtml b/gazelle-tm-war/src/main/webapp/testing/results/connectathonResultsDetails.xhtml index ab6e02b49aa6400322e3f655aca86e685a3a46c7..2854b2c42ef73804eff8558983edc53568ca15d1 100644 --- a/gazelle-tm-war/src/main/webapp/testing/results/connectathonResultsDetails.xhtml +++ b/gazelle-tm-war/src/main/webapp/testing/results/connectathonResultsDetails.xhtml @@ -62,7 +62,7 @@ <a4j:repeat var="entry" value="#{details}"> <h:panelGroup - rendered="#{(connectathonResult.testTypeToKeep == entry.getTestType()) or (connectathonResult.testTypeToKeep == 'all')}"> + rendered="#{(connectathonResult.testTypeToKeep == 'all') or ((connectathonResult.testTypeToKeep == entry.getTestType()) or (entry.containsUnderlyingFilterType(connectathonResult.testTypeToKeep)))}"> <tr> <h:panelGroup rendered="#{!entry.isMetaTest()}"> <td>