Mercurial > hg > ismi-richfaces
changeset 54:2e7447712fd1
nicer links to scan viewer.
author | casties |
---|---|
date | Fri, 02 Oct 2015 11:52:42 +0000 |
parents | e59787774e6e |
children | e15c7ddeb76c |
files | src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java src/main/webapp/search/displayAuthor.xhtml |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java Fri Oct 02 10:43:13 2015 +0000 +++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java Fri Oct 02 11:52:42 2015 +0000 @@ -223,7 +223,7 @@ Attribute pub = om.getAttributeByName(codex.getId(), "public"); if (pub != null && pub.getValue().equals("true")) { // FIXME: make viewer URL configurable - this.scanViewer = "https://ismi-dev.mpiwg-berlin.mpg.de/om4-ismi/public/publicWitness.jsp?eid=" + this.id; + this.scanViewer = "/public/publicWitness.jsp?eid=" + this.id; } for (Relation rel : om.getSourceRelations(codex, "owned_by", "PERSON", -1)) {
--- a/src/main/webapp/search/displayAuthor.xhtml Fri Oct 02 10:43:13 2015 +0000 +++ b/src/main/webapp/search/displayAuthor.xhtml Fri Oct 02 11:52:42 2015 +0000 @@ -411,9 +411,12 @@ </h:panelGrid> <h:outputText value="Scans" /> - <h:outputLink value="#{Session.displayAuthor.witness.scanViewer}"> + <h:outputLink rendered="#{!empty Session.displayAuthor.witness.scanViewer}" + value="#{request.contextPath}#{Session.displayAuthor.witness.scanViewer}" + target="_blank"> See witness scans </h:outputLink> + <h:outputText rendered="#{empty Session.displayAuthor.witness.scanViewer}"/> <h:outputText value="Notes" /> <h:outputText value="#{Session.displayAuthor.witness.notes}" />