Commit ee526688 authored by Malo Toudic's avatar Malo Toudic
Browse files
parent 46b5e07d
......@@ -68,6 +68,11 @@ VALUES (nextval('app_configuration_id_seq'), 'ehealthsuisse', 'false');
/* PART 2 */
ALTER TABLE cmn_transaction_instance ALTER COLUMN standard type VARCHAR(64);
INSERT INTO app_configuration (id, variable, value)
VALUES (nextval('app_configuration_id_seq'), 'tool_instance_oid', 'oid');
INSERT INTO app_configuration (id, variable, value)
VALUES (nextval('app_configuration_id_seq'), 'evs_client_url', 'url');
......@@ -3,7 +3,6 @@ package net.ihe.gazelle.wstester.action;
import net.ihe.gazelle.common.tree.GazelleTreeNodeImpl;
import net.ihe.gazelle.preferences.PreferenceService;
import net.ihe.gazelle.wstester.dao.ExecutionDao;
import net.ihe.gazelle.wstester.model.CustomProperty;
import net.ihe.gazelle.wstester.model.CustomPropertyUsed;
import net.ihe.gazelle.wstester.model.Execution;
import net.ihe.gazelle.wstester.model.TestComponent;
......@@ -15,6 +14,7 @@ import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.security.Identity;
import org.richfaces.event.ItemChangeEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -131,4 +131,27 @@ public class ExecutionResult {
public GazelleTreeNodeImpl<TestComponent> getComponentWithParentsAsTree() {
return Tree.getComponentWithParentsAsTree(execution.getTestComponent());
}
private String current;
private boolean singleMode;
public boolean isSingleMode() {
return singleMode;
}
public void setSingleMode(boolean singleMode) {
this.singleMode = singleMode;
}
public String getCurrent() {
return this.current;
}
public void setCurrent(String current) {
this.current = current;
}
public void updateCurrent(ItemChangeEvent event) {
setCurrent(event.getNewItemName());
}
}
......@@ -54,11 +54,13 @@ public class Execution implements Serializable {
private TestComponent testComponent;
@OneToMany(
fetch = FetchType.EAGER,
targetEntity = GwtTestStepResult.class,
mappedBy = "execution",
cascade = CascadeType.ALL,
orphanRemoval = true
)
@Fetch(value = FetchMode.SUBSELECT)
private List<GwtTestStepResult> testStepResults;
@OneToMany(
......
......@@ -51,7 +51,7 @@ public class GwtTestStepResult implements Serializable {
@Column(name = "endpoint")
private String endpoint;
@OneToOne(fetch = FetchType.LAZY,
@OneToOne(fetch = FetchType.EAGER,
cascade = CascadeType.ALL)
@JoinColumn(name = "messages")
private TransactionInstance messages;
......@@ -64,7 +64,7 @@ public class GwtTestStepResult implements Serializable {
@JoinColumn(name = "execution_id")
private Execution execution;
@ElementCollection
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "gwt_soapui_messages", joinColumns = @JoinColumn(name = "gwt_test_step_result_id"))
@Column(name = "soapui_messages")
@Lob
......
......@@ -58,7 +58,7 @@
</ui:decorate>
<h:commandButton value="Add a SoapUI project" action="/uploadProject.seam" styleClass="gzl-btn-green"
rendered="#{identity.loggedIn}"/>
rendered="#{identity.loggedIn and s:hasRole('admin_role')}"/>
<s:div id="resultDiv">
<rich:dataTable id="projectsTable"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment