From 8562503ef663b0063a9b1eda642a6580602ad87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=81=A5=E8=BE=89?= <wangjianhui0918@gmail.com>
Date: Tue, 25 Jun 2019 18:11:58 +0800
Subject: [PATCH] modify dtable interface

---
 frontend/src/components/dialog/create-table-dialog.js | 1 -
 frontend/src/pages/dtable/dtable.js                   | 2 +-
 seahub/api2/endpoints/dtable.py                       | 5 ++++-
 seahub/dtable/models.py                               | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/dialog/create-table-dialog.js b/frontend/src/components/dialog/create-table-dialog.js
index 49b0c3ef70..f95348e6ea 100644
--- a/frontend/src/components/dialog/create-table-dialog.js
+++ b/frontend/src/components/dialog/create-table-dialog.js
@@ -32,7 +32,6 @@ class CreateTableDialog extends React.Component {
     let options = [];
     seafileAPI.getAccountInfo().then((res) => {
       let obj = {};
-      console.log(res);
       obj.value = 'Personal';
       obj.email = res.data.email;
       obj.label = 'Personal';
diff --git a/frontend/src/pages/dtable/dtable.js b/frontend/src/pages/dtable/dtable.js
index d7333a0593..f6abeb3f3e 100644
--- a/frontend/src/pages/dtable/dtable.js
+++ b/frontend/src/pages/dtable/dtable.js
@@ -211,7 +211,7 @@ class Workspace extends Component {
 
     return(
       <div className="workspace my-2">
-        <div>{workspace.owner_name}</div>
+        <div>{workspace.owner_type === 'Personal' ? gettext('My Tables') : workspace.owner_name}</div>
         <table width="100%" className="table-vcenter">
           <colgroup>
             <col width="4%"/><col width="31%"/><col width="30%"/><col width="27%"/><col width="8%"/>
diff --git a/seahub/api2/endpoints/dtable.py b/seahub/api2/endpoints/dtable.py
index b319af99e9..60ab39f4cc 100644
--- a/seahub/api2/endpoints/dtable.py
+++ b/seahub/api2/endpoints/dtable.py
@@ -112,13 +112,16 @@ class WorkspacesView(APIView):
             if '@seafile_group' in owner:
                 group_id = int(owner.split('@')[0])
                 owner_name = group_id_to_name(group_id)
+                owner_type = "Group"
             else:
                 owner_name = email2nickname(owner)
+                owner_type = "Personal"
 
             table_list = DTables.objects.get_dtable_by_workspace(workspace)
 
             res = workspace.to_dict()
             res["owner_name"] = owner_name
+            res["owner_type"] = owner_type
             res["table_list"] = table_list
             workspace_list.append(res)
 
@@ -222,7 +225,7 @@ class DTablesView(APIView):
             return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
 
         try:
-            dtable = DTables.objects.create_dtable(table_owner, workspace, table_name)
+            dtable = DTables.objects.create_dtable(username, workspace, table_name)
         except Exception as e:
             logger.error(e)
             error_msg = 'Internal Server Error'
diff --git a/seahub/dtable/models.py b/seahub/dtable/models.py
index 25026be654..c95ea4c74c 100644
--- a/seahub/dtable/models.py
+++ b/seahub/dtable/models.py
@@ -92,12 +92,12 @@ class DTablesManager(models.Manager):
         except self.model.DoesNotExist:
             return None
 
-    def create_dtable(self, owner, workspace, name):
+    def create_dtable(self, username, workspace, name):
         try:
             return super(DTablesManager, self).get(workspace=workspace, name=name)
         except self.model.DoesNotExist:
             dtable = self.model(workspace=workspace, name=name,
-                                creator=owner, modifier=owner)
+                                creator=username, modifier=username)
             dtable.save()
             return dtable