#8184 change nominal url add redirect

sekmiller · sekmiller · commit 8084bc66cbd8 · 2024-10-16T10:33:35.000-04:00
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java
@@ -30,7 +30,7 @@ public class PrivateUrl {
 
     public PrivateUrl(RoleAssignment roleAssignment, Dataset dataset, String dataverseSiteUrl) {
         this.token = roleAssignment.getPrivateUrlToken();
-        this.link = dataverseSiteUrl + "/privateurl.xhtml?token=" + token;
+        this.link = dataverseSiteUrl + "/previewurl.xhtml?token=" + token;
         this.dataset = dataset;
         this.roleAssignment = roleAssignment;
     }
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -1190,7 +1190,7 @@
                             
                             <p>
                             <p>
-                                <h:outputText   styleClass="highlightBold" value="#{bundle['dataset.privateurl.general.title']}"></h:outputText></p>   
+                            <h:outputText   styleClass="highlightBold" value="#{bundle['dataset.privateurl.general.title']}"></h:outputText></p>   
                             <p>#{bundle['dataset.privateurl.general.description']}</p>     
                             <p:commandButton styleClass="btn btn-default" 
                                              value="#{bundle['dataset.privateurl.general.button.label']}" 
diff --git a/src/main/webapp/previewurl.xhtml b/src/main/webapp/previewurl.xhtml
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:p="http://primefaces.org/ui">
+    <h:head>
+    </h:head>
+
+    <h:body>
+        <ui:composition template="/dataverse_template.xhtml">
+            <ui:param name="pageTitle" value="#{bundle['dataset.privateurl.header']}"/>
+            <ui:param name="showDataverseHeader" value="false"/>
+            <ui:define name="body">
+                <f:metadata>
+                    <f:viewParam name="token" value="#{PrivateUrlPage.token}"/>
+                    <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+                    <f:viewAction action="#{PrivateUrlPage.init}" />
+                </f:metadata>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class PrivateUrl {`
`30`	`30`
`31`	`31`	`public PrivateUrl(RoleAssignment roleAssignment, Dataset dataset, String dataverseSiteUrl) {`
`32`	`32`	`this.token = roleAssignment.getPrivateUrlToken();`
`33`		`- this.link = dataverseSiteUrl + "/privateurl.xhtml?token=" + token;`
	`33`	`+ this.link = dataverseSiteUrl + "/previewurl.xhtml?token=" + token;`
`34`	`34`	`this.dataset = dataset;`
`35`	`35`	`this.roleAssignment = roleAssignment;`
`36`	`36`	`}`