Commit 406175ef authored by Malo Toudic's avatar Malo Toudic
Browse files
parent 7b0ecad2
......@@ -127,4 +127,8 @@ public class TestInstanceResult implements Serializable {
public String getInstanceLink() {
return ApplicationConfiguration.getValueOfVariable("tm_url") + "gazelle/testInstance.seam?id=" + this.getTestInstance();
}
public String getTestInstanceToString(){
return Integer.toString(testInstance);
}
}
......@@ -68,11 +68,11 @@
#{execution.id}
</h:outputLink>
</g:column>
<g:column sortBy="#{'soapuiProject.label'}" filterBy="#{'soapuiProject'}">
<g:column sortBy="#{'soapuiProject.label'}" filterBy="#{'soapuiProject.label'}">
<ui:define name="header">Project</ui:define>
<h:outputText value="#{execution.soapuiProject.label}"/>
</g:column>
<g:column sortBy="#{'testInstanceResult.testInstance'}" filterBy="#{'testInstanceResult'}">
<g:column sortBy="#{'testInstanceResult.testInstance'}">
<ui:define name="header">Test Instance</ui:define>
<h:outputText value="#{execution.testInstanceResult.testInstance}"/>
</g:column>
......
......@@ -99,7 +99,9 @@
var="testStepResult">
<g:column>
<ui:define name="header">Transaction</ui:define>
<h:outputText value="#{testStepResult.testStep.label}"/>
<a href="#testStepResult#{testStepResult.id}">
<h:outputText value="#{testStepResult.testStep.label}"/>
</a>
</g:column>
<g:column>
<ui:define name="header">SoapUI Validation</ui:define>
......@@ -160,6 +162,7 @@
expanded="true">
<a4j:commandLink render="paramPanel" ajaxSingle="true"
actionListener="#{executionResult.setCustomPropertyUsedList(node.data)}"
oncomplete="sidebarReset()"
value="#{node.data.label}"/>
</rich:treeNode>
<rich:treeNode iconExpanded="images/testsuite.png"
......@@ -168,6 +171,7 @@
expanded="true">
<a4j:commandLink render="paramPanel" ajaxSingle="true"
actionListener="#{executionResult.setCustomPropertyUsedList(node.data)}"
oncomplete="sidebarReset()"
value="#{node.data.label}"/>
</rich:treeNode>
<rich:treeNode iconExpanded="images/project.png"
......@@ -176,6 +180,7 @@
expanded="true">
<a4j:commandLink render="paramPanel" ajaxSingle="true"
actionListener="#{executionResult.setCustomPropertyUsedList(node.data)}"
oncomplete="sidebarReset()"
value="#{node.data.label}"/>
</rich:treeNode>
</rich:tree>
......@@ -247,22 +252,6 @@
</li>
</c:forEach>
</ul>
<!--@formatter:off-->
<script>
$(document).ready(function () {
var sidebarTop = $('#nav-sidebar').offset().top;
$(window).bind('scroll', function () {
var navHeight = sidebarTop;
if ($(window).scrollTop() > navHeight) {
$('nav#nav-sidebar').addClass(' gzl-affix-right');
}
else {
$('nav#nav-sidebar').removeClass(' gzl-affix-right');
}
});
});
</script>
<!--@formatter:on-->
</nav>
</div>
<div class="col-lg-10">
......@@ -343,7 +332,8 @@
</div>
</f:facet>
<s:div rendered="#{testStepResult.getRequestContent() != null}" style="overflow: auto">
<s:div rendered="#{testStepResult.getRequestContent() != null}"
style="overflow: auto">
<s:decorate template="/layout/display/_display.xhtml">
......@@ -401,7 +391,8 @@
</div>
</f:facet>
<s:div rendered="#{testStepResult.getResponseContent() != null}" style="overflow: auto">
<s:div rendered="#{testStepResult.getResponseContent() != null}"
style="overflow: auto">
<s:decorate template="/layout/display/_display.xhtml">
<ui:define name="label">Timestamp</ui:define>
<h:outputText value="#{testStepResult.getResponseTimestamp()}"/>
......@@ -465,5 +456,28 @@
</gri:panel>
</h:form>
<script type="text/javascript">
function sidebarReset() {
console.log("sidebar function");
var sidebarTop = $('#nav-sidebar').offset().top;
$(window).bind('scroll', function () {
var navHeight = sidebarTop;
if ($(window).scrollTop() > navHeight) {
$('nav#nav-sidebar').addClass(' gzl-affix-right');
}
else {
$('nav#nav-sidebar').removeClass(' gzl-affix-right');
}
});
}
$(document).ready(sidebarReset);
document.getElementById("properties_panelheadingOne").onclick = function call(){
setTimeout(sidebarReset, 1000);
};
document.getElementById("summary_panelheadingOne").onclick = function call2(){
setTimeout(sidebarReset, 1000);
};
</script>
</ui:define>
</ui:composition>
\ No newline at end of file
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