From 3bbb44602b55ee6d765720d256a678630e534a36 Mon Sep 17 00:00:00 2001
From: C_Q <helloworld.c@outlook.com>
Date: Wed, 19 Dec 2018 16:07:56 +0800
Subject: [PATCH] fix getParentDectionaryUrl func (#2669)

---
 .../src/components/dialog/share-to-group.js   |  4 +--
 .../src/components/dialog/share-to-user.js    |  4 +--
 frontend/src/markdown-editor.js               |  6 ++++-
 frontend/src/pages/share-admin/folders.js     |  4 +--
 frontend/src/pages/share-admin/libraries.js   |  4 +--
 frontend/src/utils/utils.js                   | 26 ++++++++++++++-----
 seahub/templates/view_file_markdown.html      |  1 +
 7 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/dialog/share-to-group.js b/frontend/src/components/dialog/share-to-group.js
index f672f73dc3..331614d9a4 100644
--- a/frontend/src/components/dialog/share-to-group.js
+++ b/frontend/src/components/dialog/share-to-group.js
@@ -34,7 +34,7 @@ class GroupItem extends React.Component {
     return (
       <tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
         <td>{item.group_info.name}</td>
-        <td>{Utils.sharePerms[item.permission]}</td>
+        <td>{Utils.sharePerms(item.permission)}</td>
         <td>
           <span
             className={`sf2-icon-x3 sf2-x op-icon a-simulate ${this.state.isOperationShow ? '' : 'hide'}`}
@@ -128,7 +128,7 @@ class ShareToGroup extends React.Component {
       });
     } else if (e.target.value == 'Preview-Edit-on-Cloud') {
       this.setState({
-        permission: 'clod-edit',
+        permission: 'cloud-edit',
       });
     } else if (e.target.value == 'Preview-on-Cloud') {
       this.setState({
diff --git a/frontend/src/components/dialog/share-to-user.js b/frontend/src/components/dialog/share-to-user.js
index cd44498fe8..38af38a759 100644
--- a/frontend/src/components/dialog/share-to-user.js
+++ b/frontend/src/components/dialog/share-to-user.js
@@ -33,7 +33,7 @@ class UserItem extends React.Component {
     return (
       <tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
         <td>{item.user_info.nickname}</td>
-        <td>{Utils.sharePerms[item.permission]}</td>
+        <td>{Utils.sharePerms(item.permission)}</td>
         <td>
           <span
             className={`sf2-icon-x3 sf2-x op-icon a-simulate ${this.state.isOperationShow ? '' : 'hide'}`}
@@ -112,7 +112,7 @@ class ShareToUser extends React.Component {
       });
     } else if (e.target.value == 'Preview-Edit-on-Cloud') {
       this.setState({
-        permission: 'clod-edit',
+        permission: 'cloud-edit',
       });
     } else if (e.target.value == 'Preview-on-Cloud') {
       this.setState({
diff --git a/frontend/src/markdown-editor.js b/frontend/src/markdown-editor.js
index 9d553bfa58..23bbcec78c 100644
--- a/frontend/src/markdown-editor.js
+++ b/frontend/src/markdown-editor.js
@@ -2,8 +2,10 @@ import React from 'react';
 import SeafileEditor from '@seafile/seafile-editor';
 import 'whatwg-fetch';
 import { SeafileAPI } from 'seafile-js';
+import { Utils } from './utils/utils';
 import cookie from 'react-cookies';
 let repoID = window.app.pageOptions.repoID;
+let repoName = window.app.pageOptions.repoName;
 let filePath = window.app.pageOptions.filePath;
 let fileName = window.app.pageOptions.fileName;
 let siteRoot = window.app.config.siteRoot;
@@ -66,7 +68,9 @@ class EditorUtilities {
 
   getParentDectionaryUrl() {
     let parentPath = this.filePath.substring(0, this.filePath.lastIndexOf('/'));
-    return this.serviceUrl + '/#common/lib/' + this.repoID + parentPath;
+    let libName = encodeURIComponent(repoName);
+    let path = Utils.encodePath(parentPath);
+    return this.serviceUrl + '/library/' + this.repoID + '/' + libName + path + '/';
   }
   
   _getImageURL(fileName) {
diff --git a/frontend/src/pages/share-admin/folders.js b/frontend/src/pages/share-admin/folders.js
index c269286dd2..7353ffb5b7 100644
--- a/frontend/src/pages/share-admin/folders.js
+++ b/frontend/src/pages/share-admin/folders.js
@@ -198,14 +198,14 @@ class Item extends Component {
     }
 
     data.cur_perm = share_permission;
-    data.cur_perm_text = Utils.sharePerms[data.cur_perm];
+    data.cur_perm_text = Utils.sharePerms(data.cur_perm);
 
     let iconVisibility = this.state.showOpIcon ? '' : ' invisible';
     let editIconClassName = 'perm-edit-icon sf2-icon-edit op-icon' + iconVisibility; 
     let unshareIconClassName = 'unshare op-icon sf2-icon-delete' + iconVisibility;
 
     let permOption = function(options) {
-        return <option value={options.perm}>{Utils.sharePerms[options.perm]}</option>;
+        return <option value={options.perm}>{Utils.sharePerms(options.perm)}</option>;
     };
 
     const item = (
diff --git a/frontend/src/pages/share-admin/libraries.js b/frontend/src/pages/share-admin/libraries.js
index 1de7e0d875..13416eef85 100644
--- a/frontend/src/pages/share-admin/libraries.js
+++ b/frontend/src/pages/share-admin/libraries.js
@@ -204,14 +204,14 @@ class Item extends Component {
     if (data.show_admin && is_admin) {
       data.cur_perm = 'admin';
     }
-    data.cur_perm_text = Utils.sharePerms[data.cur_perm];
+    data.cur_perm_text = Utils.sharePerms(data.cur_perm);
 
     let iconVisibility = this.state.showOpIcon ? '' : ' invisible';
     let editIconClassName = 'perm-edit-icon sf2-icon-edit op-icon' + iconVisibility; 
     let unshareIconClassName = 'unshare op-icon sf2-icon-delete' + iconVisibility;
 
     let permOption = function(options) {
-        return <option value={options.perm}>{Utils.sharePerms[options.perm]}</option>;
+        return <option value={options.perm}>{Utils.sharePerms(options.perm)}</option>;
     };
 
     const item = (
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index b703b1459b..d17a74c074 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -302,12 +302,26 @@ export const Utils = {
     return title;
   },
 
-  sharePerms: {
-    'rw': gettext("Read-Write"),
-    'r': gettext("Read-Only"),
-    'admin': gettext("Admin"),
-    'cloud-edit': gettext("Preview-Edit-on-Cloud"),
-    'preview': gettext("Preview-on-Cloud")
+  sharePerms: function(permission) {
+    var title;
+    switch(permission) {
+      case 'rw':
+        title = gettext("Read-Write");
+        break;
+      case 'r':
+        title = gettext("Read-Only");
+        break;
+      case 'admin':
+        title = gettext("Admin");
+        break;
+      case 'cloud-edit':
+        title = gettext("Preview-Edit-on-Cloud");
+        break;
+      case 'preview':
+        title = gettext("Preview-on-Cloud");
+        break;
+    }
+    return title;
   },
 
   formatSize: function(options) {
diff --git a/seahub/templates/view_file_markdown.html b/seahub/templates/view_file_markdown.html
index 2bac940364..80a94ebef3 100644
--- a/seahub/templates/view_file_markdown.html
+++ b/seahub/templates/view_file_markdown.html
@@ -20,6 +20,7 @@
               },
               pageOptions: {
                   repoID: '{{ repo.id }}',
+                  repoName: '{{ repo.name|escapejs }}',
                   filePath: '{{ path|escapejs }}',
                   fileName: '{{ filename|escapejs }}',
                   domain: '{{ domain }}',