From 69e1dc2ba51e0c7fad8165a6896350ba29534827 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Thu, 5 Oct 2017 07:45:43 +1000
Subject: [PATCH] fix: encode doc name in doc-tab page

https://zanata.atlassian.net/browse/ZNTA-2226
---
 .../src/main/java/org/zanata/action/VersionHomeAction.java      | 2 +-
 .../src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/org/zanata/action/VersionHomeAction.java b/server/services/src/main/java/org/zanata/action/VersionHomeAction.java
index bdd4cb04f74..8e10dd974ed 100644
--- a/server/services/src/main/java/org/zanata/action/VersionHomeAction.java
+++ b/server/services/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -931,7 +931,7 @@ public void setDefaultTranslationDocType(String fileName) {
     public String getEditorUrl(String sourceLocale, String docId) {
         return urlUtil.editorDocumentUrl(projectSlug, versionSlug,
                 selectedLocale.getLocaleId(),
-                LocaleId.fromJavaName(sourceLocale), TokenUtil.encode(docId));
+                LocaleId.fromJavaName(sourceLocale), urlUtil.encodeString(TokenUtil.encode(docId)));
     }
 
     public String encodeDocId(String docId) {
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
index bdde46d1952..13e31ab325b 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
@@ -331,7 +331,7 @@
 
                 <ui:fragment rendered="#{hLocale.active}">
                   <a
-                    href="#{request.contextPath}/webtrans/Application.xhtml?project=#{versionHomeAction.projectSlug}&amp;iteration=#{versionHomeAction.versionSlug}&amp;localeId=#{hLocale.localeId}&amp;locale=#{facesContext.externalContext.requestLocale}#{dswidParam}#view:doc;doc:#{versionHomeAction.selectedDocument.docId}">
+                    href="#{request.contextPath}/webtrans/translate?project=#{versionHomeAction.projectSlug}&amp;iteration=#{versionHomeAction.versionSlug}&amp;localeId=#{hLocale.localeId}&amp;locale=#{facesContext.externalContext.requestLocale}#{dswidParam}#view:doc;doc:#{versionHomeAction.encodeDocId(versionHomeAction.selectedDocument.docId)}">
                     <div class="list__item">
                       <div class="list__item__info">
                         <h3 class="list__title">