diff --git a/progit/lib/git.py b/progit/lib/git.py index 99a068c..9f90e0a 100644 --- a/progit/lib/git.py +++ b/progit/lib/git.py @@ -91,7 +91,7 @@ def write_gitolite_acls(session, configfile): config.append(' RW+ = %s' % project.user.user) for user in project.users: if user != project.user: - config.append(' RW+ = %s' % user.user.user) + config.append(' RW+ = %s' % user.user) config.append('') config.append('repo docs/%s' % project.fullname) @@ -99,7 +99,7 @@ def write_gitolite_acls(session, configfile): config.append(' RW+ = %s' % project.user.user) for user in project.users: if user != project.user: - config.append(' RW+ = %s' % user.user.user) + config.append(' RW+ = %s' % user.user) config.append('') config.append('repo tickets/%s' % project.fullname) @@ -107,7 +107,7 @@ def write_gitolite_acls(session, configfile): config.append(' RW+ = %s' % project.user.user) for user in project.users: if user != project.user: - config.append(' RW+ = %s' % user.user.user) + config.append(' RW+ = %s' % user.user) config.append('') with open(configfile, 'w') as stream: diff --git a/progit/templates/settings.html b/progit/templates/settings.html index a77d8ee..7b8e331 100644 --- a/progit/templates/settings.html +++ b/progit/templates/settings.html @@ -70,9 +70,9 @@ {% for user in repo.users %}
  • - {{ user.user.user }} + {{ user.user }}
    + action="{{ url_for('.remove_user', username=username, repo=repo.name, userid=user.id) }}">