LailaTheElf/hedgedoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show only projects where user is creator, has project access >= 20, or has group access.

Browse Source
This commit is contained in:
Jason Croft 2016-05-13 10:32:30 -04:00
parent edcb766b63
commit 930afdc337
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app.js
View File

@ -448,6 +448,7 @@ app.get('/gitlab', function (req, res) {
models.User.findById(req.cookies.userid) models.User.findById(req.cookies.userid)
.then(function(user) { .then(function(user) {
ret.accesstoken = user.accessToken; ret.accesstoken = user.accessToken;
ret.profileid = user.profileid;
request( request(
config.gitlab.baseURL + '/api/v3/projects?access_token=' + user.accessToken, config.gitlab.baseURL + '/api/v3/projects?access_token=' + user.accessToken,
function(error, httpResponse, body) { function(error, httpResponse, body) {

10
public/js/index.js
View File

@ -1164,7 +1164,10 @@ ui.toolbar.export.snippet.click(function() {
return (a.path_with_namespace < b.path_with_namespace) ? -1 : ((a.path_with_namespace > b.path_with_namespace) ? 1 : 0); return (a.path_with_namespace < b.path_with_namespace) ? -1 : ((a.path_with_namespace > b.path_with_namespace) ? 1 : 0);
}); });
data.projects.forEach(function(project) { data.projects.forEach(function(project) {
if (!project.snippets_enabled) { if (!project.snippets_enabled
|| (project.permissions.project_access === null && project.permissions.group_access === null)
|| (project.permissions.project_access !== null && project.permissions.project_access.access_level < 20))
{
return; return;
} }
$('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetExportModalProjects"); $('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetExportModalProjects");
@ -1249,7 +1252,10 @@ ui.toolbar.import.snippet.click(function () {
return (a.path_with_namespace < b.path_with_namespace) ? -1 : ((a.path_with_namespace > b.path_with_namespace) ? 1 : 0); return (a.path_with_namespace < b.path_with_namespace) ? -1 : ((a.path_with_namespace > b.path_with_namespace) ? 1 : 0);
}); });
data.projects.forEach(function(project) { data.projects.forEach(function(project) {
if (!project.snippets_enabled) { if (!project.snippets_enabled
|| (project.permissions.project_access === null && project.permissions.group_access === null)
|| (project.permissions.project_access !== null && project.permissions.project_access.access_level < 20))
{
return; return;
} }
$('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetImportModalProjects"); $('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetImportModalProjects");