From c0651fbf5f7b42be47844f8171a685bcc3b5bb6c Mon Sep 17 00:00:00 2001
From: wangjianhui <wang@163.com>
Date: Thu, 13 Dec 2018 11:15:20 +0800
Subject: [PATCH] get dir_id from headers

---
 frontend/src/components/dir-view/dir-view.js |  4 ++--
 frontend/src/repo-wiki-mode.js               |  4 ++--
 seahub/api2/views.py                         | 10 +++-------
 seahub/templates/view_file_text.html         |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/dir-view/dir-view.js b/frontend/src/components/dir-view/dir-view.js
index 4f36aa8319..665c92332c 100644
--- a/frontend/src/components/dir-view/dir-view.js
+++ b/frontend/src/components/dir-view/dir-view.js
@@ -74,13 +74,13 @@ class DirView extends React.Component {
     let repoID = this.state.repoID;
     this.setState({isDirentListLoading: true});
     seafileAPI.listDir(repoID, filePath).then(res => {
-      let direntList = res.data.data.map(item => {
+      let direntList = res.data.map(item => {
         return new Dirent(item);
       });
       this.setState({
         isDirentListLoading: false,
         direntList: direntList,
-        dirID: res.data.oid,
+        dirID: res.headers.oid,
       });
     }).catch(() => {
       this.setState({pathExist: false});
diff --git a/frontend/src/repo-wiki-mode.js b/frontend/src/repo-wiki-mode.js
index 882323156f..367fff7a19 100644
--- a/frontend/src/repo-wiki-mode.js
+++ b/frontend/src/repo-wiki-mode.js
@@ -272,14 +272,14 @@ class Wiki extends Component {
     this.setState({isDirentListLoading: true});
     seafileAPI.listDir(repoID, filePath).then(res => {
       let direntList = [];
-      res.data.data.forEach(item => {
+      res.data.forEach(item => {
         let dirent = new Dirent(item);
         direntList.push(dirent);
       });
       this.setState({
         direntList: direntList,
         isDirentListLoading: false,
-        dirID: res.data.oid,
+        dirID: res.headers.oid,
       });
     });
   }
diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index d9ffa275a8..c2d2e9892e 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -2047,14 +2047,10 @@ def get_dir_entrys_by_id(request, repo, path, dir_id, request_type=None):
     else:
         dentrys = dir_list + file_list
 
-    data = dict()
-    data["data"] = dentrys
-    data["oid"] = dir_id
-    data["dir_perm"] = seafile_api.check_permission_by_path(repo.id, path, username)
-    response = HttpResponse(json.dumps(data), status=200,
+    response = HttpResponse(json.dumps(dentrys), status=200,
                             content_type=json_content_type)
-    # response["oid"] = dir_id
-    # response["dir_perm"] = seafile_api.check_permission_by_path(repo.id, path, username)
+    response["oid"] = dir_id
+    response["dir_perm"] = seafile_api.check_permission_by_path(repo.id, path, username)
     return response
 
 def get_shared_link(request, repo_id, path):
diff --git a/seahub/templates/view_file_text.html b/seahub/templates/view_file_text.html
index 8c3aa252b2..0bba3c5835 100644
--- a/seahub/templates/view_file_text.html
+++ b/seahub/templates/view_file_text.html
@@ -74,7 +74,7 @@
          cache: false,
          success: function(data) {
            if (data.id !== cid) {
-             alert('File updated! Refresh.') //TODO
+            //  alert('File updated! Refresh.') //TODO
            }
          }
     })