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 branch '5.0'

Browse Source 
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
This commit is contained in:
zhengxie
2016-01-13 10:19:56 +08:00
parent e669b7e7e8 bf26f9c2a3
commit cf3d96b46a
70 changed files with 9551 additions and 8722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/scripts/app/views/group-repo.js
View File

@@ -21,6 +21,11 @@ define([
this.group_id = options.group_id;
this.is_staff = options.is_staff;
this.show_shared_by = true; // default
if (options.show_shared_by !== undefined) { // e.g. views/group-item.js
this.show_shared_by = options.show_shared_by;
}
this.listenTo(this.model, 'destroy', this.remove);
},
@@ -32,7 +37,8 @@ define([
// for '#groups' (no 'share_from_me')
share_from_me: app.pageOptions.username == this.model.get('owner') ? true : false,
// 'owner_name' for '#groups', 'owner_nickname' for '#group/id/'
owner_name: this.model.get('owner_nickname') || this.model.get('owner_name')
owner_name: this.model.get('owner_nickname') || this.model.get('owner_name'),
show_shared_by: this.show_shared_by
});
this.$el.html(this.template(obj));
return this;