From 9489ce5ab4c9473fbe102d338f130f8b23052ed9 Mon Sep 17 00:00:00 2001 From: Steffen Remus Date: Mon, 12 Jun 2017 17:39:14 +0200 Subject: [PATCH] updated webanno master --- webanno | 2 +- .../webanno/api/dao/ProjectInitializationServiceImpl.java | 4 ++-- .../ukp/clarin/webanno/ui/project/ProjectMediaPanel.java | 2 +- webanno-webapp-exm/pom.xml | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/webanno b/webanno index 9e43fbc..c55bd44 160000 --- a/webanno +++ b/webanno @@ -1 +1 @@ -Subproject commit 9e43fbc8c55de55ab1fa8af3893a6aa99b509e46 +Subproject commit c55bd441c8809b8ed241236a94264a739981b624 diff --git a/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java b/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java index 5270c16..8d92080 100644 --- a/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java +++ b/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java @@ -66,7 +66,7 @@ private void createTranscriptLayer(Project aProject) playbuttonSegmentLayer.setReadonly(false); playbuttonSegmentLayer.setMultipleTokens(false); // playbuttonSegmentLayer.setZeroWidthOnly(true); - playbuttonSegmentLayer.setOnClickJavascriptAction("window.open('partitur/${PID}/${DOCID}#${AnchorID}', 'partitur')"); + playbuttonSegmentLayer.setOnClickJavascriptAction("window.open(`partitur/${params.PID}/${params.DOCID}#${params.AnchorID}`, 'partitur');"); annotationService.createLayer(playbuttonSegmentLayer); AnnotationFeature playbuttonSegmentLayerInfoFeature = new AnnotationFeature(); @@ -92,7 +92,7 @@ private void createTranscriptLayer(Project aProject) playbuttonLayer.setReadonly(true); playbuttonLayer.setMultipleTokens(false); // playbuttonLayer.setZeroWidthOnly(true); - playbuttonLayer.setOnClickJavascriptAction("window.open('partitur/${PID}/${DOCID}#${AnchorID}', 'partitur')"); + playbuttonLayer.setOnClickJavascriptAction("window.open(`partitur/${params.PID}/${params.DOCID}#${params.AnchorID}`, 'partitur')"); annotationService.createLayer(playbuttonLayer); AnnotationFeature playbuttonLayerInfoFeature = new AnnotationFeature(); diff --git a/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectMediaPanel.java b/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectMediaPanel.java index cfa72eb..04bcf00 100644 --- a/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectMediaPanel.java +++ b/webanno-plugin-exmaralda/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectMediaPanel.java @@ -137,7 +137,7 @@ private List getDocumentList() { // ) // ) // .collect(Collectors.toList()); - return documentService.listSourceDocuments(data.selected_project).stream().filter(d -> !d.isTrainingDocument()) + return documentService.listSourceDocuments(data.selected_project).stream() .map(d -> d.getName()).collect(Collectors.toList()); } diff --git a/webanno-webapp-exm/pom.xml b/webanno-webapp-exm/pom.xml index eadec8f..f990d37 100644 --- a/webanno-webapp-exm/pom.xml +++ b/webanno-webapp-exm/pom.xml @@ -27,6 +27,10 @@ WebAnno - EXMARaLDA - Application war + + de.tudarmstadt.ukp.clarin.webanno + webanno-automation + de.tudarmstadt.ukp.clarin.webanno webanno-ui-automation @@ -295,6 +299,7 @@ de.tudarmstadt.ukp.clarin.webanno:webanno-doc de.tudarmstadt.ukp.clarin.webanno:webanno-remote + de.tudarmstadt.ukp.clarin.webanno:webanno-automation de.tudarmstadt.ukp.clarin.webanno:webanno-io-tei de.tudarmstadt.ukp.clarin.webanno:webanno-io-tsv