1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00

Merge branch '6.2'

This commit is contained in:
llj
2018-03-15 11:26:02 +08:00
179 changed files with 30811 additions and 30926 deletions

View File

@@ -41,7 +41,8 @@ define([
this.$el.html(this.template({
title: gettext("Share {placeholder}")
.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(this.repo_name) + '">' + Common.HTMLescape(this.repo_name) + '</span>'),
repo_id: this.repo_id
repo_id: this.repo_id,
is_pro: app.pageOptions.is_pro
}));
return this;
@@ -77,6 +78,7 @@ define([
"user_email": item.user_email,
"user_name": item.user_name,
"permission": item.permission,
"is_admin": item.is_admin,
"for_user": true
}
});
@@ -114,6 +116,7 @@ define([
"group_id": item.group_id,
"group_name": item.group_name,
"permission": item.permission,
"is_admin": item.is_admin,
'for_user': false
}
});
@@ -165,6 +168,7 @@ define([
"user_email": item.user_email,
"user_name": item.user_name,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': true
}
});
@@ -238,6 +242,7 @@ define([
"group_id": item.group_id,
"group_name": item.group_name,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': false
}
});