haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Shared with me (#2393)

Browse Source 
* update api of shared with me

return 'group_name' field if current library is a group owned library

* add api for delete shared in group owned repo

* [shared with me] modification for 'group owned repo'
This commit is contained in:
llj
2018-09-21 15:43:16 +08:00
committed by Daniel Pan
parent c51da1c832
commit 28cc3762b0
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/templates/js/templates.html
View File

@@ -1429,7 +1429,7 @@
</td>
<td><%= size_formatted %></td>
<td><%= mtime_relative %></td>
<td><span title="<%- owner_nickname %>"><%- owner_nickname %></span></td>
<td><span title="<%- owner_name_shown %>"><%- owner_name_shown %></span></td>
</script>
<script type="text/template" id="shared-repo-mobile-tmpl">
<td>
@@ -1437,7 +1437,7 @@
</td>
<td>
<a href="#shared-libs/lib/<%= id %>" class="normal"><%- name %></a><br />
<span class="repo-meta-info" title="<%- owner %>"><%- owner_nickname %></span>
<span class="repo-meta-info" title="<%- owner_name_shown %>"><%- owner_name_shown %></span>
<span class="repo-meta-info"><%= size_formatted %></span>
<span class="repo-meta-info"><%= mtime_relative %></span>
</td>

24
static/scripts/app/views/shared-repo.js
View File

@@ -52,9 +52,21 @@ define([
}
};
var url,
repo_id = this.model.get('id'),
owner = this.model.get('owner');
if (owner.indexOf('@seafile_group') == -1) {
url = Common.getUrl({name: 'beshared_repo', repo_id: repo_id})
+ "?share_type=personal&from=" + encodeURIComponent(owner);
} else {
url = Common.getUrl({
name: 'group-owned-library-user-share-in-library',
repo_id: repo_id
});
}
$.ajax({
url: Common.getUrl({name: 'beshared_repo', repo_id: this.model.get('id')})
+ "?share_type=personal&from=" + encodeURIComponent(this.model.get('owner')),
url: url,
type: 'DELETE',
beforeSend: Common.prepareCSRFToken,
dataType: 'json',
@@ -69,9 +81,15 @@ define([
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var tmpl = $(window).width() >= 768 ? this.template : this.mobileTemplate;
var owner_name_shown = obj.owner_name;
if (obj.owner.indexOf('@seafile_group') != -1) {
owner_name_shown = obj.group_name;
}
_.extend(obj, {
'icon_url': icon_url,
'icon_title': this.model.getIconTitle()
'icon_title': this.model.getIconTitle(),
'owner_name_shown': owner_name_shown
});
this.$el.html(tmpl(obj));
return this;

1
static/scripts/common.js
View File

@@ -128,6 +128,7 @@ define([
case 'group-owned-library-user-folder-permission': return siteRoot + 'api/v2.1/group-owned-libraries/' + options.repo_id + '/user-folder-permission/';
case 'group-owned-library-group-folder-permission': return siteRoot + 'api/v2.1/group-owned-libraries/' + options.repo_id + '/group-folder-permission/';
case 'group-owned-library-user-share-in-library': return siteRoot + 'api/v2.1/group-owned-libraries/user-share-in-libraries/' + options.repo_id + '/';
// Share admin
case 'share_admin_repos': return siteRoot + 'api/v2.1/shared-repos/';