Author: reto
Date: Thu Jun 6 19:08:13 2013
New Revision: 1490398
URL: http://svn.apache.org/r1490398
Log:
STANBOL-1097: no longer using instance as object passed to infor-template
Modified:
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
stanbol/branches/commons-ng/commons/jobs/web/src/main/resources/templates/html/org/apache/stanbol/commons/jobs/web/resources/JobsResource/info.ftl
Modified:
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java?rev=1490398&r1=1490397&r2=1490398&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
(original)
+++
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
Thu Jun 6 19:08:13 2013
@@ -130,7 +130,7 @@ public class JobsResource extends BaseSt
if(isHTML()){
// Result as HTML
- return Response.ok(new Viewable("info", this)).build();
+ return Response.ok(new Viewable("info", info)).build();
}else{
// Result as application/json, text/plain
return Response.ok(info).build();
Modified:
stanbol/branches/commons-ng/commons/jobs/web/src/main/resources/templates/html/org/apache/stanbol/commons/jobs/web/resources/JobsResource/info.ftl
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/src/main/resources/templates/html/org/apache/stanbol/commons/jobs/web/resources/JobsResource/info.ftl?rev=1490398&r1=1490397&r2=1490398&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/jobs/web/src/main/resources/templates/html/org/apache/stanbol/commons/jobs/web/resources/JobsResource/info.ftl
(original)
+++
stanbol/branches/commons-ng/commons/jobs/web/src/main/resources/templates/html/org/apache/stanbol/commons/jobs/web/resources/JobsResource/info.ftl
Thu Jun 6 19:08:13 2013
@@ -20,7 +20,7 @@
<div class="panel">
<p><b>Status: </b> ${it.jobInfo.status}</p>
-<p><b>Output location: </b> <a
href="${it.jobInfo.outputLocation}">${it.jobInfo.outputLocation}</a></p>
+<p><b>Output location: </b> <a
href="${it.outputLocation}">${it.outputLocation}</a></p>
<p><b>Messages:</b> </p>
<ul>
<#list it.jobInfo.messages as message>
