diff --git a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/messageprofiles/view/HL7MessageProfileManagerView.java b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/messageprofiles/view/HL7MessageProfileManagerView.java
index 6a8f20547b7dbcdcf93c70ec74b72f99c7bcf7b9..b15515da77d08036a6f36dee3aa8291924652d77 100644
--- a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/messageprofiles/view/HL7MessageProfileManagerView.java
+++ b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/messageprofiles/view/HL7MessageProfileManagerView.java
@@ -112,6 +112,7 @@ public class HL7MessageProfileManagerView implements Serializable {
this.hl7Application = new HL7Application();
// TODO use injection
this.hl7Application.setMessageProfilesDAO(new MessageProfilesDAOImpl());
+ getAllMessageProfiles();
}
/**
@@ -261,10 +262,6 @@ public class HL7MessageProfileManagerView implements Serializable {
*/
public void displayProfilesList() {
this.hl7Application.setSelectedMessageProfileReference(null);
-
- if ((getAllMessageProfilesReferences()== null) || getAllMessageProfilesReferences().getWrappedData()==null) {
- getAllMessageProfiles();
- }
}
/**
diff --git a/GazelleHL7v2Validator-ui/pom.xml b/GazelleHL7v2Validator-ui/pom.xml
index 63e8cdb6f506838676ca96319027e43fccdfc345..9af71496787852e5cf2de8ea8be978c7123e93ba 100644
--- a/GazelleHL7v2Validator-ui/pom.xml
+++ b/GazelleHL7v2Validator-ui/pom.xml
@@ -1,48 +1,66 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>GazelleHL7v2Validator</artifactId>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>GazelleHL7v2Validator</artifactId>
+ <groupId>net.ihe.gazelle</groupId>
+ <version>3.9.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle</groupId>
+ <artifactId>GazelleHL7v2Validator-ui</artifactId>
+ <packaging>war</packaging>
+ <name>GazelleHL7v2Validator-ui</name>
<version>3.9.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>net.ihe.gazelle</groupId>
- <artifactId>GazelleHL7v2Validator-ui</artifactId>
- <packaging>war</packaging>
- <name>GazelleHL7v2Validator-ui</name>
- <version>3.9.1-SNAPSHOT</version>
- <description>Archetype for the UI part of our java projects</description>
- <organization>
- <name>INRIA - IHE Development</name>
- </organization>
- <dependencies>
- <dependency>
- <groupId>net.ihe.gazelle.maven</groupId>
- <artifactId>gazelle-seam-tools-war</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>net.ihe.gazelle</groupId>
- <artifactId>mbval-documentation-war</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>net.ihe.gazelle</groupId>
- <artifactId>gazelle-assets</artifactId>
- <version>3.0.1</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>net.ihe.gazelle</groupId>
- <artifactId>gazelle-gdpr-war</artifactId>
- <version>1.5.0</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>net.ihe.gazelle</groupId>
- <artifactId>cas-client-ui-v7</artifactId>
- <type>war</type>
- </dependency>
- </dependencies>
+ <description>Archetype for the UI part of our java projects</description>
+ <organization>
+ <name>INRIA - IHE Development</name>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gazelle-plugins</artifactId>
+ <version>${gazelle.plugins.version}</version>
+ <configuration>
+ <ignoredParamNames>
+ <ignoredParamName>dataScrollerId</ignoredParamName>
+ <ignoredParamName>dataTableId</ignoredParamName>
+ </ignoredParamNames>
+ <targetDirectory/>
+ <ramRootFolder/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>net.ihe.gazelle.maven</groupId>
+ <artifactId>gazelle-seam-tools-war</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>net.ihe.gazelle</groupId>
+ <artifactId>mbval-documentation-war</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>net.ihe.gazelle</groupId>
+ <artifactId>gazelle-assets</artifactId>
+ <version>3.0.1</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>net.ihe.gazelle</groupId>
+ <artifactId>gazelle-gdpr-war</artifactId>
+ <version>1.5.0</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>net.ihe.gazelle</groupId>
+ <artifactId>cas-client-ui-v7</artifactId>
+ <type>war</type>
+ </dependency>
+ </dependencies>
</project>
diff --git a/GazelleHL7v2Validator-ui/src/main/messages/GazelleHL7v2Validator.properties b/GazelleHL7v2Validator-ui/src/main/messages/GazelleHL7v2Validator.properties
index 0597a1f797b83f161b06fc5b5085d305527bd87f..84461b1b80998484455fdccc8bf6699ed052ac6d 100644
--- a/GazelleHL7v2Validator-ui/src/main/messages/GazelleHL7v2Validator.properties
+++ b/GazelleHL7v2Validator-ui/src/main/messages/GazelleHL7v2Validator.properties
@@ -262,7 +262,6 @@ net.ihe.gazelle.hl7.ClassesDocumentation=Classes documentation
net.ihe.gazelle.hl7.ClassesDocumentation_2=classes documentation
net.ihe.gazelle.hl7.ConstraintsDocumentation=Constraints documentation
net.ihe.gazelle.hl7.ConstraintsDocumentation_2=constraints documentation
-net.ihe.gazelle.hl7.Ds=ds
net.ihe.gazelle.hl7.EditProfile=Edit profile
net.ihe.gazelle.hl7.EditResource=Edit resource
net.ihe.gazelle.hl7.ForceUpdateusedToSyncRevisionNumbers=Force update ?(used to sync revision numbers
@@ -319,7 +318,6 @@ net.ihe.gazelle.hl7.PatientLocationQueryResponse=PatientLocationQueryResponse
net.ihe.gazelle.hl7.Pdqv3continuation=pdqv3continuation
net.ihe.gazelle.hl7.Pdqv3query=pdqv3query
net.ihe.gazelle.hl7.Pdqv3response=pdqv3response
-net.ihe.gazelle.hl7.ProfilesTable=profilesTable
net.ihe.gazelle.hl7.QUQIIN000003UV01=QUQI_IN000003UV01
net.ihe.gazelle.hl7.QUQIIN000003UV01Cancel=QUQI_IN000003UV01_Cancel
net.ihe.gazelle.hl7.Quqimt000001UV01=quqimt000001UV01
diff --git a/GazelleHL7v2Validator-ui/src/main/webapp/browser/profilesList.xhtml b/GazelleHL7v2Validator-ui/src/main/webapp/browser/profilesList.xhtml
index c9ff350f6a38e896ca06b638f9b98acd87b6923f..a5f583d0d387f079f5b99f08592c1e403b9f627b 100644
--- a/GazelleHL7v2Validator-ui/src/main/webapp/browser/profilesList.xhtml
+++ b/GazelleHL7v2Validator-ui/src/main/webapp/browser/profilesList.xhtml
@@ -66,9 +66,8 @@
</g:column>
<f:facet name="footer">
<ui:include src="/util/datatableFooter.xhtml">
- <ui:param name="dataScrollerId" value="#{messages['net.ihe.gazelle.hl7.Ds']}"/>
- <ui:param name="dataTableId"
- value="#{messages['net.ihe.gazelle.hl7.ProfilesTable']}"/>
+ <ui:param name="dataScrollerId" value="ds"/>
+ <ui:param name="dataTableId" value="profilesTable"/>
</ui:include>
</f:facet>
</rich:dataTable>