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

Merge branch '6.2'

Browse Source 
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
This commit is contained in:
zhengxie
2018-04-27 11:00:43 +08:00
parent 302f980093 3ee97bc440
commit 8d10466ce9
22 changed files with 350 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/scripts/app/router.js
View File

@@ -236,7 +236,12 @@ define([
},
showGroupDiscussions: function(group_id) {
this.showGroup(group_id, {showDiscussions: true});
if (app.pageOptions.enable_group_discussion) {
this.showGroup(group_id, {showDiscussions: true});
} else {
this.showGroup(group_id);
app.router.navigate('group/' + group_id + '/');
}
},
showOrgRepos: function() {