haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3730 from haiwen/modify-dtable-interface

Browse Source 
repair dtable interface
This commit is contained in:
Daniel Pan
2019-06-25 18:20:24 +08:00
committed by GitHub
parent 7d1c1b271e 8562503ef6
commit abaa97fc30
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/dialog/create-table-dialog.js
View File

@@ -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';

2
frontend/src/pages/dtable/dtable.js
View File

@@ -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%"/>

5
seahub/api2/endpoints/dtable.py
View File

@@ -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'

4
seahub/dtable/models.py
View File

@@ -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