Merge branch '7.0'

frontend/src/file-history-old.js

@@ -68,7 +68,10 @@ class FileHistory extends React.Component {
     if (result.total_count < 5) {
       if (result.data.length) {
         let commitID = result.data[result.data.length-1].commit_id;
-        seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, commitID).then((res) => {
+        let path = result.data[result.data.length-1].path;
+        let oldPath = result.data[result.data.length-1].old_path;
+        path = oldPath ? oldPath : path;
+        seafileAPI.listOldFileHistoryRecords(historyRepoID, path, commitID).then((res) => {
           if (!res.data) {
             this.setState({isLoading: false});
             throw Error('There is an error in server.');

frontend/src/shared-dir-view.js

@@ -16,7 +16,7 @@ import './css/shared-dir-view.css';
 import './css/grid-view.css';
 
 let loginUser = window.app.pageOptions.name;
-const { token, trafficOverLimit, dirName, sharedBy, path, canDownload, mode, thumbnailSize } = window.shared.pageOptions;
+const { token, trafficOverLimit, dirName, sharedBy, path, canDownload, mode, thumbnailSize, zipped } = window.shared.pageOptions;
 
 const showDownloadIcon = !trafficOverLimit && canDownload;
 
@@ -93,28 +93,20 @@ class SharedDirView extends React.Component {
   }
 
   renderPath = () => {
-    // path: '/', or '/g/'
-    if (path == '/') {
-      return dirName;
-    }
-
-    let pathList = path.substr(0, path.length -1).split('/');
     return (
       <React.Fragment>
-        <a href={`?p=${encodeURIComponent('/')}&mode=${mode}`}>{dirName}</a>
+        {zipped.map((item, index) => {
-        <span> / </span>
+          if (index != zipped.length - 1) {
-        {pathList.map((item, index) => {
-          if (index > 0 && index != pathList.length - 1) {
             return (
               <React.Fragment key={index}>
-                <a href={`?p=${encodeURIComponent(pathList.slice(0, index+1).join('/'))}&mode=${mode}`}>{pathList[index]}</a>
+                <a href={`?p=${encodeURIComponent(item.path)}&mode=${mode}`}>{item.name}</a>
                 <span> / </span>
               </React.Fragment>
             );
           }
+        })
         }
-        )}
+        {zipped[zipped.length - 1].name}
-        {pathList[pathList.length - 1]}
       </React.Fragment>
     );
   }

seahub/api2/endpoints/repos.py

@@ -120,6 +120,7 @@ class ReposView(APIView):
                     "permission": 'rw',  # Always have read-write permission to owned repo
                     "starred": r.repo_id in starred_repo_id_list,
                     "status": normalize_repo_status_code(r.status),
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
 
                 if is_pro_version() and ENABLE_STORAGE_CLASSES:
@@ -182,6 +183,7 @@ class ReposView(APIView):
                     "permission": r.permission,
                     "starred": r.repo_id in starred_repo_id_list,
                     "status": normalize_repo_status_code(r.status),
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
 
                 if r.repo_id in repos_with_admin_share_to:
@@ -225,6 +227,7 @@ class ReposView(APIView):
                     "permission": r.permission,
                     "starred": r.repo_id in starred_repo_id_list,
                     "status": normalize_repo_status_code(r.status),
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
                 repo_info_list.append(repo_info)
 
@@ -269,6 +272,7 @@ class ReposView(APIView):
                     "permission": r.permission,
                     "starred": r.repo_id in starred_repo_id_list,
                     "status": normalize_repo_status_code(r.status),
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
                 repo_info_list.append(repo_info)
 

seahub/api2/views.py

@@ -734,6 +734,7 @@ class Repos(APIView):
                     "root": '',
                     "head_commit_id": r.head_cmmt_id,
                     "version": r.version,
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
 
                 if is_pro_version() and ENABLE_STORAGE_CLASSES:
@@ -801,6 +802,7 @@ class Repos(APIView):
                     "head_commit_id": r.head_cmmt_id,
                     "version": r.version,
                     "group_name": library_group_name,
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
 
                 if r.repo_id in repos_with_admin_share_to:
@@ -858,6 +860,7 @@ class Repos(APIView):
                     "share_from": r.user,
                     "share_from_name": nickname_dict.get(r.user, ''),
                     "share_from_contact_email": contact_email_dict.get(r.user, ''),
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
                 repos_json.append(repo)
 
@@ -898,6 +901,7 @@ class Repos(APIView):
                     "root": '',
                     "head_commit_id": r.head_cmmt_id,
                     "version": r.version,
+                    "salt": r.salt if r.enc_version == 3 else '',
                 }
                 repos_json.append(repo)
 

seahub/templates/view_shared_dir_react.html

@@ -22,6 +22,16 @@
             dirName: '{{ dir_name|escapejs }}',
             sharedBy: '{{ username|email2nickname|escapejs }}',
             path: '{{ path|escapejs }}',
+            zipped: (function() {
+              var list = [];
+              {% for name, path in zipped %}
+              list.push({
+                'name': '{{ name|escapejs }}',
+                'path': '{{ path|escapejs }}'
+              });
+              {% endfor %}
+              return list;
+            })(),
             token: '{{ token }}',
             mode: '{{ mode }}',
             thumbnailSize: {{ thumbnail_size }},