haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #995 from haiwen/group_fix

Browse Source 
show group name in path for 'group dir view'; fix updateGroups in sid…
This commit is contained in:
Daniel Pan
2016-01-13 16:24:22 +08:00
parent 5cc1c14e5e 53fddee277
commit 35bec4b59f
5 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,8 @@
</script>
<script type="text/template" id="dir-path-bar-tmpl">
<% if (context == 'group') { %>
<a href="#<%= category %>/" class="path-link normal">{% trans "Group" %}</a> /
<a href="#groups/" class="path-link normal">{% trans "Groups" %}</a> /
<a href="#<%= category %>/" class="path-link normal"><%- group_name %></a> /
<% } else if (context == 'org') { %>
<a href="#<%= category %>/" class="path-link normal">{% trans "Organization" %}</a> /
<% } else if (context == 'common') { %>

10
static/scripts/app/views/dir.js
View File

@@ -110,7 +110,9 @@ define([
});
},
showDir: function(category, repo_id, path) {
// 'category' is sth. like url prefix
// options is for 'group dir view', at present (Wed Jan 13 12:44:17 CST 2016)
showDir: function(category, repo_id, path, options) {
$('#top-search-form').html(this.top_search_form_template({
search_repo_id: repo_id
}));
@@ -118,6 +120,9 @@ define([
this.$el.show();
this.$dirent_list.empty();
var loading_tip = this.$('.loading-tip').show();
this.contextOptions = options;
var dir = this.dir;
dir.setPath(category, repo_id, path);
var _this = this;
@@ -280,6 +285,9 @@ define([
category: dir.category,
context: context
};
if (this.contextOptions) {
$.extend(obj, this.contextOptions);
}
var path_list = path.substr(1).split('/');
var path_list_encoded = Common.encodePath(path.substr(1)).split('/');

10
static/scripts/app/views/group.js
View File

@@ -146,7 +146,15 @@ define([
showDir: function(group_id, repo_id, path) {
this.group_id = group_id;
this.hideRepoList();
this.dirView.showDir('group/' + this.group_id, repo_id, path);
var group_name = Common.groupId2Name(group_id);
if (group_name) {
this.dirView.showDir('group/' + this.group_id, repo_id, path, {'group_name': group_name});
} else {
// the group does not exist
Common.feedback('Group {group_id} not found'.replace('{group_id}', group_id), 'error');
app.router.navigate('my-libs/', {trigger: true});
}
},
createRepo: function() {

15
static/scripts/app/views/side-nav.js
View File

@@ -103,10 +103,21 @@ define([
dataType: 'json',
cache: false,
success: function(data) {
data.sort(function(a, b) {
var groups = [];
for (var i = 0, len = data.length; i < len; i++) {
groups.push({
'id': data[i].id,
'name': data[i].name
});
}
groups.sort(function(a, b) {
return Common.compareTwoWord(a.name, b.name);
});
_this.data.groups = data;
// update app.pageOptions.groups
app.pageOptions.groups = groups;
_this.data.groups = groups;
_this.render();
},
error: function() {

12
static/scripts/common.js
View File

@@ -664,6 +664,18 @@ define([
} else {
return bytes + ' B';
}
},
groupId2Name: function(group_id) {
var group_name;
var groups = app.pageOptions.groups;
for (var i = 0, len = groups.length; i < len; i++) {
if (group_id == groups[i].id) {
group_name = groups[i].name;
break;
}
}
return group_name;
}
}