From 2e098b628e0d5438ab9a2902827ab42e3bb039e0 Mon Sep 17 00:00:00 2001 From: lian Date: Sun, 18 Sep 2016 11:58:14 +0800 Subject: [PATCH] enable library template when create group/pub repo --- seahub/api2/views.py | 16 ++++++++++++++++ static/scripts/app/views/add-group-repo.js | 3 ++- static/scripts/app/views/create-pub-repo.js | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/seahub/api2/views.py b/seahub/api2/views.py index 642e31c5b4..8d7454df6a 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -741,6 +741,7 @@ class PubRepos(APIView): if permission != 'r' and permission != 'rw': return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission') + org_id = -1 if is_org_context(request): org_id = request.user.org.org_id repo_id = seafile_api.create_org_repo(repo_name, repo_desc, @@ -754,6 +755,13 @@ class PubRepos(APIView): repo = seafile_api.get_repo(repo_id) seafile_api.add_inner_pub_repo(repo.id, permission) + library_template = request.data.get("library_template", None) + repo_created.send(sender=None, + org_id=org_id, + creator=username, + repo_id=repo_id, + repo_name=repo_name, + library_template=library_template) pub_repo = { "id": repo.id, "name": repo.name, @@ -3711,6 +3719,7 @@ class GroupRepos(APIView): if permission != 'r' and permission != 'rw': return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission') + org_id = -1 if is_org_context(request): org_id = request.user.org.org_id repo_id = seafile_api.create_org_repo(repo_name, repo_desc, @@ -3724,6 +3733,13 @@ class GroupRepos(APIView): repo = seafile_api.get_repo(repo_id) seafile_api.set_group_repo(repo.id, group.id, username, permission) + library_template = request.data.get("library_template", None) + repo_created.send(sender=None, + org_id=org_id, + creator=username, + repo_id=repo_id, + repo_name=repo_name, + library_template=library_template) group_repo = { "id": repo.id, "name": repo.name, diff --git a/static/scripts/app/views/add-group-repo.js b/static/scripts/app/views/add-group-repo.js index 98581f126a..5f568aaeb5 100644 --- a/static/scripts/app/views/add-group-repo.js +++ b/static/scripts/app/views/add-group-repo.js @@ -12,7 +12,8 @@ define([ templateData: function() { return { showSharePerm: true, - enable_encrypted_library: app.pageOptions.enable_encrypted_library + enable_encrypted_library: app.pageOptions.enable_encrypted_library, + library_templates: app.pageOptions.library_templates }; }, diff --git a/static/scripts/app/views/create-pub-repo.js b/static/scripts/app/views/create-pub-repo.js index 63cdceaaf9..a9e87c5ced 100644 --- a/static/scripts/app/views/create-pub-repo.js +++ b/static/scripts/app/views/create-pub-repo.js @@ -12,7 +12,8 @@ define([ templateData: function() { return { showSharePerm: true, - enable_encrypted_library: app.pageOptions.enable_encrypted_library + enable_encrypted_library: app.pageOptions.enable_encrypted_library, + library_templates: app.pageOptions.library_templates }; },