diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/DatahouseURIServiceImpl.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/DatahouseURIServiceImpl.java
index c35210f2b4704b15fcca9741421b7551051de686..171475a14a5bd163dc170a3573e6fdd0af8be0a1 100644
--- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/DatahouseURIServiceImpl.java
+++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/DatahouseURIServiceImpl.java
@@ -38,6 +38,7 @@ public class DatahouseURIServiceImpl implements DatahouseURIService {
private static final String CHANNEL_TYPE = "channel_type";
private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
private static final Logger LOG = LoggerFactory.getLogger(DatahouseURIServiceImpl.class);
+ private static final String DATE_INTERVAL_SEPARATOR = "_";
@In
DatahouseURIServiceDAO datahouseURIServiceDAO;
@@ -134,7 +135,7 @@ public class DatahouseURIServiceImpl implements DatahouseURIService {
private void setCapturedDateParam(TestStepsInstance testStepsInstance, URIBuilder uriBuilder) throws URISyntaxException {
String interval = getCaptureInterval(testStepsInstance);
- if (!",".equals(interval)) {
+ if (!DATE_INTERVAL_SEPARATOR.equals(interval)) {
String dateParam = "[" + interval + "]";
uriBuilder.setParameter(CAPTURED_DATE, dateParam).build();
}
@@ -153,7 +154,7 @@ public class DatahouseURIServiceImpl implements DatahouseURIService {
if (testStepsInstance.getStartDate() != null) {
interval += dateFormat.format(testStepsInstance.getStartDate());
}
- interval += ",";
+ interval += DATE_INTERVAL_SEPARATOR;
if (testStepsInstance.getEndDate() != null)
interval += dateFormat.format(testStepsInstance.getEndDate());
return interval;
diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/registration/gui/RegistrationBeanGui.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/registration/gui/RegistrationBeanGui.java
index 26cc3ffc0ae0734360e7dc4a240dbd5f2daf27f0..7dc6ff14669f790ea33f09cb281f7fed24ed2b10 100644
--- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/registration/gui/RegistrationBeanGui.java
+++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/registration/gui/RegistrationBeanGui.java
@@ -412,7 +412,7 @@ public class RegistrationBeanGui implements Serializable {
}
public boolean isManageAttendeeButtonDisplayed() {
- return (isAttendeesRegistrationEnabled() && identity.hasRole(Role.VENDOR_ADMIN));
+ return (isAttendeesRegistrationEnabled() && identity.hasRole(Role.VENDOR_ADMIN) && isTestingSessionOpened());
}
public boolean checkContractRole() {
@@ -443,13 +443,15 @@ public class RegistrationBeanGui implements Serializable {
}
public boolean showAddImportOrNewSUTButton() {
- return registrationOpen || Identity.instance().hasRole(Role.VENDOR_LATE_REGISTRATION);
+ return registrationOpen || (Identity.instance().hasRole(Role.VENDOR_LATE_REGISTRATION) && isTestingSessionOpened());
}
public boolean canDeleteSUT(SystemSummary systemSummary) {
return registrationOpen && Identity.instance().hasRole(Role.VENDOR_ADMIN) && !systemSummary.isAccepted();
}
+ public boolean isTestingSessionOpened() {return !selectedTestingSession.getSessionClosed(); };
+
/////////////////// Links ///////////////////
public String manageSUTsButton() {
diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/systems/action/AbstractSystemInSessionEditor.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/systems/action/AbstractSystemInSessionEditor.java
index b59da4105695d13f8cd2381efed3663e6c77af84..efae5425ed0b523bfa00fb3cee69394536a9616a 100644
--- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/systems/action/AbstractSystemInSessionEditor.java
+++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/systems/action/AbstractSystemInSessionEditor.java
@@ -93,7 +93,7 @@ public abstract class AbstractSystemInSessionEditor extends SystemInSessionNavig
}
public boolean userIsCreator(SystemInSession currentSystemInSession) {
- String ownerUserName = currentSystemInSession.getSystem().getOwnerUserId();
+ String ownerUserName = currentSystemInSession != null ? currentSystemInSession.getSystem().getOwnerUserId(): "";
String userName = identity.getUsername();
return ownerUserName.equals(userName);
}
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 8dd7f811ffcce6a0d79cf6d153ca9faeb8890627..a4a11ec79997463a3810a95cccf5b01723288011 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 a6f3cccdbfb8061e05c909ca507bbaedff609eaa..b7030c64dc0c0f8565309c327be01decf4a85f8f 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accepter toutes syst\u00E8mes list\u00
net.ihe.gazelle.tm.AcceptancePending=Acceptation en attente
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Les types de fichiers accept\u00E9s sont \: pdf, doc, rtf, odt, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Acc\u00E9der aux messages dans Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Acc\u00E9der aux messages dans Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Acc\u00E9der \u00E0 la liste des tests et aux logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 879b8a7be57fbaa26cd89b98b19b19e3a29ea88c..964984504e1a92398b2254dfb7b0d1280cd86d5f 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 98ae198ad1691f24d6045af9eda64e2cf0591e01..3203002712525882d9ed9dfced50703b413b9613 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=\u3059\u3079\u3066\u306E\u30B7\u30B9\u
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=SUT\u304B\u3089\u53D7\u4FE1\u3057\u305FAck
net.ihe.gazelle.tm.Action=\u30A2\u30AF\u30B7\u30E7\u30F3
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 a624d1e9ddc854b6da29bc757bcf941b294b88da..3d22750e577bb02f5049e2aa0c2200b53e2e8fc2 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
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 703f13aacec6a03202288f5666ffc6bbf045bea4..9fee0ccc2500e5ee9ac42386778aa581575d0f1d 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
@@ -1847,7 +1847,6 @@ net.ihe.gazelle.tm.AcceptAllListedSystems=Accept all listed systems
net.ihe.gazelle.tm.AcceptancePending=Acceptance pending
net.ihe.gazelle.tm.AcceptedFileTypesArePdfDocOdtRtfDocx=Accepted file types are\: pdf, doc, odt, rtf, docx.
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessTestListAndLogs=Access test list and logs
net.ihe.gazelle.tm.AcknowledgementReceivedFromSUT=Acknowledgement received from SUT
net.ihe.gazelle.tm.Action=Action
diff --git a/gazelle-tm-war/src/main/messages/tm.properties b/gazelle-tm-war/src/main/messages/tm.properties
index bdba8664141e6324fff1fcc1b76022f35404fecd..5472ac7389b9866a4f0a8be546b4fd0a3c819ff1 100644
--- a/gazelle-tm-war/src/main/messages/tm.properties
+++ b/gazelle-tm-war/src/main/messages/tm.properties
@@ -3355,7 +3355,6 @@ net.ihe.gazelle.tm.Capturing=Capturing...
net.ihe.gazelle.tm.RestartCapture=Restart capture
net.ihe.gazelle.tm.StartCapture=Start capture
net.ihe.gazelle.tm.ExtendCapture=Extend capture
-net.ihe.gazelle.tm.AccessMessagesInProxyBeta=Access messages in Proxy beta
net.ihe.gazelle.tm.AccessMessagesInProxy=Access messages in Proxy
net.ihe.gazelle.tm.CaptureAgain=Capture again
net.ihe.gazelle.tm.MessageHasBeenCapturedBetween=Message has been captured between
diff --git a/gazelle-tm-war/src/main/webapp/administration/preferencesSectionTM.xhtml b/gazelle-tm-war/src/main/webapp/administration/preferencesSectionTM.xhtml
index b17ea8d3485f1e64458d591aa87662b2ceb89df4..76df103d8dc8ba26179375df76d1cccdc204bcbe 100755
--- a/gazelle-tm-war/src/main/webapp/administration/preferencesSectionTM.xhtml
+++ b/gazelle-tm-war/src/main/webapp/administration/preferencesSectionTM.xhtml
@@ -159,27 +159,6 @@
value="#{preferencesModifier.values['gazelle_proxy_url']}" styleClass=" form-control"
required="false">
</h:inputText>
-
- </s:decorate>
- <s:decorate id="tfProxyMessageDecoration" template="/layout/form/_form_field_horizontal_inline.xhtml">
- <ui:param name="id" value="proxyMessageInput"/>
- <ui:define name="label">#{messages['gazelle.tm.application.preferences.ProxyMessage']}</ui:define>
-
- <h:inputText size="100" id="proxyMessageInput"
- value="#{preferencesModifier.values['gazelle_proxy_message']}" styleClass=" form-control"
- required="false">
- </h:inputText>
-
- </s:decorate>
- <s:decorate id="tfProxyStepDecoration" template="/layout/form/_form_field_horizontal_inline.xhtml">
- <ui:param name="id" value="proxyStepInput"/>
- <ui:define name="label">#{messages['gazelle.tm.application.preferences.ProxyStep']}</ui:define>
-
- <h:inputText size="100" id="proxyStepInput"
- value="#{preferencesModifier.values['gazelle_proxy_step']}" styleClass=" form-control"
- required="false">
- </h:inputText>
-
</s:decorate>
<s:decorate id="tfProxyWebserviceEndpointDecoration"
template="/layout/form/_form_field_horizontal_inline.xhtml">
diff --git a/gazelle-tm-war/src/main/webapp/registration/_registration-sut.xhtml b/gazelle-tm-war/src/main/webapp/registration/_registration-sut.xhtml
index d9dfd7db94e4e2fe3a6a742487cf39a0119e741e..b7a18894e96e218063aaf951f056a23507560ba0 100644
--- a/gazelle-tm-war/src/main/webapp/registration/_registration-sut.xhtml
+++ b/gazelle-tm-war/src/main/webapp/registration/_registration-sut.xhtml
@@ -103,7 +103,7 @@
<span class="gzl-icon-search"/>
</a4j:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{systemInSessionEditor.isAllowedToEdit(systemSummary)}">
+ <h:panelGroup rendered="#{systemInSessionEditor.isAllowedToEdit(systemSummary) and registrationBeanGui.isTestingSessionOpened()}">
<a4j:commandLink id="currentSystemSummary_EditSupport"
action="#{registrationBeanGui.editSystemInSessionSummaryActionRedirect(systemSummary.getSystemInSession())}"
immediate="true"
diff --git a/gazelle-tm-war/src/main/webapp/testing/test/test/TestInstance.xhtml b/gazelle-tm-war/src/main/webapp/testing/test/test/TestInstance.xhtml
index 991f62f5e5bd0ac8d5622bb6c9fb855a435d1661..475941ce1809b04ae96d9eb37da2f438d9bdd972 100644
--- a/gazelle-tm-war/src/main/webapp/testing/test/test/TestInstance.xhtml
+++ b/gazelle-tm-war/src/main/webapp/testing/test/test/TestInstance.xhtml
@@ -659,16 +659,10 @@
<div>
<h:outputLink class="gzl-btn gzl-btn-blue" target="_blank"
value="#{testInstanceManager.getDataHouseUrl(currentTestStepsInstance)}">
- <h:outputText value="#{messages['net.ihe.gazelle.tm.AccessMessagesInProxyBeta']}"/>
+ <h:outputText value="#{messages['net.ihe.gazelle.tm.AccessMessagesInProxy']}"/>
</h:outputLink>
</div>
</s:div>
- <div>
- <h:outputLink target="_blank" class="gzl-btn gzl-btn-blue"
- value="#{testInstanceManager.getProxyLink(currentTestStepsInstance)}">
- <h:outputText value="#{messages['net.ihe.gazelle.tm.AccessMessagesInProxy']}"/>
- </h:outputLink>
- </div>
</s:div>
</g:column>