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(
-
{workspace.owner_name}
+
{workspace.owner_type === 'Personal' ? gettext('My Tables') : workspace.owner_name}
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