diff --git a/pagure/templates/add_group_project.html b/pagure/templates/add_group_project.html index ca8cc08..27d2a37 100644 --- a/pagure/templates/add_group_project.html +++ b/pagure/templates/add_group_project.html @@ -14,7 +14,7 @@ {% block repo %} -
+
Add group to the {{repo.name}} project @@ -29,14 +29,10 @@ + value="" style="margin-bottom:1%"/> @@ -104,12 +100,13 @@ $( document ).ready(function() { }); } else { $("#group").attr("value", group_to_update); + $("#group").attr("readonly", true); + var group_access = "{{ group_access }}"; + if (group_access !== "None") { + $("#" + "{{ group_access.access }}").attr("selected", "selected"); + } } - $('#access').selectize({ - sortField: 'text', - }); - }); {% endblock %} diff --git a/pagure/templates/add_user.html b/pagure/templates/add_user.html index 091b98c..dd93ce4 100644 --- a/pagure/templates/add_user.html +++ b/pagure/templates/add_user.html @@ -12,7 +12,7 @@ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% block repo %} -
+
Add user to the {{repo.name}} project @@ -26,15 +26,11 @@ + value="" style="margin-bottom:1%"/> @@ -102,12 +98,13 @@ $( document ).ready(function() { }); } else { $("#user").attr("value", user_to_update); + $("#user").attr("readonly", true); + var user_access = "{{ user_access }}"; + if (user_access !== "None") { + $("#" + "{{ user_access.access }}").attr("selected", "selected"); + } } - $('#access').selectize({ - sortField: 'text', - }); - }); {% endblock %} diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 53c54e3..44ef6d8 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1778,14 +1778,17 @@ def add_user(repo, username=None, namespace=None): user_to_update = flask.request.args.get('user', '').strip() user_to_update_obj = None + user_access = None if user_to_update: user_to_update_obj = pagure.lib.search_user( - SESSION, - username=user_to_update) + SESSION, username=user_to_update) + user_access = pagure.lib.get_obj_access( + SESSION, repo, user_to_update_obj) # The requested user is not found if user_to_update_obj is None: user_to_update = None + user_access = None form = pagure.forms.AddUserForm() @@ -1819,6 +1822,7 @@ def add_user(repo, username=None, namespace=None): repo=repo, access_levels=access_levels, user_to_update=user_to_update, + user_access=user_access, ) @@ -1916,14 +1920,17 @@ def add_group_project(repo, username=None, namespace=None): group_to_update = flask.request.args.get('group', '').strip() group_to_update_obj = None + group_access = None if group_to_update: group_to_update_obj = pagure.lib.search_groups( - SESSION, - group_name=group_to_update) + SESSION, group_name=group_to_update) + group_access = pagure.lib.get_obj_access( + SESSION, repo, group_to_update_obj) # The requested group is not found if group_to_update_obj is None: group_to_update = None + group_access = None form = pagure.forms.AddGroupForm() @@ -1959,6 +1966,7 @@ def add_group_project(repo, username=None, namespace=None): repo=repo, access_levels=access_levels, group_to_update=group_to_update, + group_access=group_access, )