From 963f9a30b0b93bc752afb11166118df41387819e Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Feb 15 2017 10:28:57 +0000
Subject: Pre-fill the user/group field if that usre/group's access is being updated


Signed-off-by: Vivek Anand <vivekanand1101@gmail.com>

---

diff --git a/pagure/templates/add_group_project.html b/pagure/templates/add_group_project.html
index 7a4a45d..ca8cc08 100644
--- a/pagure/templates/add_group_project.html
+++ b/pagure/templates/add_group_project.html
@@ -82,24 +82,29 @@
         src="{{ url_for('static', filename='selectize.min.js') }}"></script>
 <script type="text/javascript">
 $( document ).ready(function() {
-  $('#group').selectize({
-      valueField: 'group',
-      labelField: 'group',
-      searchField: 'group',
-      maxItems: 1,
-      create: {{ (not config.get('ENABLE_GROUP_MNGT', False)) | lower }},
-      load: function(query, callback) {
-        if (!query.length) return callback();
-        $.getJSON(
-          "{{ url_for('api_ns.api_groups') }}", {
-            pattern: query.term
-          },
-          function( data ) {
-            callback( data.groups.map(function(x) { return { group: x }; }) );
-          }
-        );
-      }
-  });
+  var group_to_update = "{{ group_to_update }}";
+  if (!group_to_update || group_to_update === "None") {
+    $('#group').selectize({
+        valueField: 'group',
+        labelField: 'group',
+        searchField: 'group',
+        maxItems: 1,
+        create: {{ (not config.get('ENABLE_GROUP_MNGT', False)) | lower }},
+        load: function(query, callback) {
+          if (!query.length) return callback();
+          $.getJSON(
+            "{{ url_for('api_ns.api_groups') }}", {
+              pattern: query.term
+            },
+            function( data ) {
+              callback( data.groups.map(function(x) { return { group: x }; }) );
+            }
+          );
+        }
+    });
+  } else {
+    $("#group").attr("value", group_to_update);
+  }
 
   $('#access').selectize({
       sortField: 'text',
diff --git a/pagure/templates/add_user.html b/pagure/templates/add_user.html
index 43b4bb0..091b98c 100644
--- a/pagure/templates/add_user.html
+++ b/pagure/templates/add_user.html
@@ -80,24 +80,29 @@
         src="{{ url_for('static', filename='selectize.min.js') }}"></script>
 <script type="text/javascript">
 $( document ).ready(function() {
-  $('#user').selectize({
-      valueField: 'user',
-      labelField: 'user',
-      searchField: 'user',
-      maxItems: 1,
-      create: false,
-      load: function(query, callback) {
-        if (!query.length) return callback();
-        $.getJSON(
-          "{{ url_for('api_ns.api_users') }}", {
-            pattern: query.term
-          },
-          function( data ) {
-            callback( data.users.map(function(x) { return { user: x }; }) );
-          }
-        );
-      }
-  });
+  var user_to_update = "{{ user_to_update }}";
+  if (!user_to_update || user_to_update === "None") {
+    $('#user').selectize({
+        valueField: 'user',
+        labelField: 'user',
+        searchField: 'user',
+        maxItems: 1,
+        create: false,
+        load: function(query, callback) {
+          if (!query.length) return callback();
+          $.getJSON(
+            "{{ url_for('api_ns.api_users') }}", {
+              pattern: query.term
+            },
+            function( data ) {
+              callback( data.users.map(function(x) { return { user: x }; }) );
+            }
+          );
+        }
+    });
+  } else {
+    $("#user").attr("value", user_to_update);
+  }
 
   $('#access').selectize({
       sortField: 'text',
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 5ed2634..4f62a65 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -439,7 +439,7 @@
                       repo=repo.name,
                       username=username,
                       namespace=repo.namespace)
-                      }}"
+                      }}?user_to_update={{ user.user }}"
                     title="Update User Access" class="btn btn-primary btn-sm pull-xs-right">
                     <span class="oi" data-glyph="pencil"></span>
                   </a>
@@ -473,7 +473,7 @@
                       repo=repo.name,
                       username=username,
                       namespace=repo.namespace)
-                      }}"
+                      }}?group_to_update={{ group.group_name }}"
                     title="Update Group Access" class="btn btn-primary btn-sm pull-xs-right">
                     <span class="oi" data-glyph="pencil"></span>
                   </a>
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 537e33a..e40e24c 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1776,6 +1776,17 @@ def add_user(repo, username=None, namespace=None):
             403,
             'You are not allowed to add users to this project')
 
+    user_to_update = flask.request.args.get('user_to_update', '').strip()
+    user_to_update_obj = None
+    if user_to_update:
+        user_to_update_obj = pagure.lib.search_user(
+                        SESSION,
+                        username=user_to_update)
+
+    # The requested user is not found
+    if user_to_update_obj is None:
+        user_to_update = None
+
     form = pagure.forms.AddUserForm()
 
     if form.validate_on_submit():
@@ -1807,6 +1818,7 @@ def add_user(repo, username=None, namespace=None):
         username=username,
         repo=repo,
         access_levels=access_levels,
+        user_to_update=user_to_update,
     )
 
 
@@ -1902,6 +1914,17 @@ def add_group_project(repo, username=None, namespace=None):
             403,
             'You are not allowed to add groups to this project')
 
+    group_to_update = flask.request.args.get('group_to_update', '').strip()
+    group_to_update_obj = None
+    if group_to_update:
+        group_to_update_obj = pagure.lib.search_groups(
+                        SESSION,
+                        group_name=group_to_update)
+
+    # The requested group is not found
+    if group_to_update_obj is None:
+        group_to_update = None
+
     form = pagure.forms.AddGroupForm()
 
     if form.validate_on_submit():
@@ -1935,6 +1958,7 @@ def add_group_project(repo, username=None, namespace=None):
         username=username,
         repo=repo,
         access_levels=access_levels,
+        group_to_update=group_to_update,
     )