From 156d1930899f4bb5f4a0cd3e89281d060bc7814e Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jan 08 2020 10:36:55 +0000
Subject: [PATCH 1/2] Add input fields to set/reset default bz assignees


Add a user interface for the bugzilla override functions in
the pagure-dist-git plugin.

Signed-off-by: Karsten Hopp <karsten@redhat.com>

---

diff --git a/pagure/themes/srcfpo/templates/repo_master_sidebar.html b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
index edf0f1e..9636d15 100644
--- a/pagure/themes/srcfpo/templates/repo_master_sidebar.html
+++ b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
@@ -144,10 +144,40 @@
     </div>
   </div>
   {% endif %}
+  <p></p>
+  <br>
+  <br>
+  Bugzilla Overrides:
+  <br>
+  <div class="row">
+    {% if g.authenticated and repo.user.user == g.fas_user.username or pagure_admin %}
+    <div class="col">
+      <form action="" id="change_assignees">
+          <label for="fedora_assignee">Fedora Assignee</label>
+          <input title="Empty input resets assignee" class="form-control" name="fedora_assignee" id="fedora_assignee" value="{{
+                    repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}" size=8/>
+	  <br>
+          <label for="epel_assignee">EPEL Assignee</label>
+          <input title="Empty input resets assignee" class="form-control" name="epel_assignee" id="epel_assignee"value="{{
+                    repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}"
+                 description="Default assignee for EPEL bugzillas"/>
+        <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
+           Update
+        </button>
+      </form>
+    </div>
+    {% else %}
+    <div class="col">
+      Fedora Assignee:<br>
+      {{ repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}
+      <br><br>
+      EPEL Assignee:<br>
+      {{ repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}
+    {% endif %}
+  </div>
 
   <script type="text/javascript" nonce="{{ g.nonce }}">
     window.addEventListener('load', function() {
-
       set_up_monitoring = function(status){
         var _label = "Disabled"
         if (status === "monitoring") {
@@ -174,6 +204,28 @@
         }
       });
 
+      $("#update_assignees").click(function(){
+              $.ajax({
+                      url: "{{ url_for('distgit_ns.bzoverride_patch_endpoint', repo=repo.name, namespace=repo.namespace) }}",
+                      type: 'post',
+                      dataType: 'json',
+                      contentType: 'application/json',
+                      data: JSON.stringify({
+                         'epel_assignee': $('#epel_assignee').val(),
+                         'fedora_assignee': $('#fedora_assignee').val()
+                      }),
+                      success: function(res) {
+                              console.log("Successfully changed the bugzilla assignees")
+                      },
+                      error: function(res) {
+                              console.log(JSON.stringify({ 'epel_assignee': $('#epel_assignee').val(), 'fedora_assignee': $('#fedora_assignee').val() }))
+                              console.log("{{ url_for('distgit_ns.bzoverride_patch_endpoint', repo=repo.name, namespace=repo.namespace) }}")
+			      console.log(res.responseText)
+			      console.log(res.getAllResponseHeaders())
+                      }
+              })
+      });
+
       {% if g.authenticated %}
       $(".monitoring-menu a").click(function(){
         var selectedValue = $(this).attr('id');

From 5dd29167fb0175d5cf2f94cecd87606150dccf23 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 08 2020 16:59:12 +0000
Subject: [PATCH 2/2] Move the bugzilla assignee update window to a modal


- Add to the modal a button to reset the assignees to their default
  values
- Add some explanations about the two input fields
- Only show the EPEL-related information on the rpms namespace
- Fix the layout of the different items in the side-bar while at it
by:
  - Given them some top padding
  - Marking the titles as titles instead of paragraph

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/themes/srcfpo/templates/repo_master_sidebar.html b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
index 9636d15..d2670bc 100644
--- a/pagure/themes/srcfpo/templates/repo_master_sidebar.html
+++ b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
@@ -67,7 +67,7 @@
 
   {% if 'distgit_ns' in g.main_app.blueprints and not repo.is_fork and repo.namespace != 'tests'%}
   <div class="col-xs-2 line-height-1"></div>
-  <p>Monitoring status:</p>
+  <h6>Monitoring status:</h6>
   <div class="btn-group">
     {% if g.authenticated %}
     <a href="#" title="Monitoring status"
@@ -118,9 +118,9 @@
   </div>
 
   {% if g.authenticated and repo.user.user == "orphan" %}
-  <div id="take-orphan-section">
+  <div id="take-orphan-section" class="pt-3">
     <div class="col-xs-2 line-height-1"></div>
-    <p>Orphaned:</p>
+    <h6>Orphaned:</h6>
     <div class="btn-group">
       <a href="#" title="Adopt this orphaned package"
           class="btn btn-sm btn-outline-primary"
@@ -133,7 +133,7 @@
   {% elif not g.authenticated and repo.user.user == "orphan" %}
     <div id="take-orphan-section">
     <div class="col-xs-2 line-height-1"></div>
-    <p>Orphaned:</p>
+    <h6>Orphaned:</h6>
     <div class="btn-group">
       <a href="#" title="Adopt this orphaned package"
           class="btn btn-sm btn-outline-primary disabled"
@@ -144,36 +144,76 @@
     </div>
   </div>
   {% endif %}
-  <p></p>
-  <br>
-  <br>
-  Bugzilla Overrides:
-  <br>
-  <div class="row">
-    {% if g.authenticated and repo.user.user == g.fas_user.username or pagure_admin %}
-    <div class="col">
-      <form action="" id="change_assignees">
-          <label for="fedora_assignee">Fedora Assignee</label>
-          <input title="Empty input resets assignee" class="form-control" name="fedora_assignee" id="fedora_assignee" value="{{
-                    repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}" size=8/>
-	  <br>
-          <label for="epel_assignee">EPEL Assignee</label>
-          <input title="Empty input resets assignee" class="form-control" name="epel_assignee" id="epel_assignee"value="{{
-                    repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}"
-                 description="Default assignee for EPEL bugzillas"/>
-        <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
-           Update
-        </button>
-      </form>
+
+  <div class="pt-3">
+    <div class="col-xs-2 line-height-1">
+    <h6>Bugzilla Assignee:</h6>
+      <dl>
+        <dt>Fedora: </dt>
+        <dd id="fedora_assignee_txt">
+        {{ repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}
+        </dd>
+        {% if repo.namespace == 'rpms' %}
+        <dt>EPEL: </dt>
+        <dd id="epel_assignee_txt">
+        {{ repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}
+        </dd>
+        {% endif %}
+      </dl>
+      {% if g.authenticated and repo.user.user == g.fas_user.username or pagure_admin %}
+        <div class="btn-group">
+          <a href="#" title="Update the bugzill assignee(s)"
+              class="btn btn-sm btn-outline-primary"
+              data-toggle="modal" data-target="#modal_assignee">
+            <i id="update-bz-icon" class="fa fa-fw fa-refresh"></i>
+            Update
+          </a>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+
+  <div class="modal fade" id="modal_assignee" tabindex="-1"
+          role="dialog" aria-labelledby="Bugzilla assignee" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Bugzilla Assignee</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+            <span class="sr-only">Close</span>
+          </button>
+        </div>
+        <form id="change_assignees">
+          <div class="modal-body">
+            <label for="fedora_assignee">Fedora</label>
+            <input title="Default assignee for Fedora in bugzilla - Empty input resets to default"
+              class="form-control" name="fedora_assignee" id="fedora_assignee" value="{{
+                repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}"/>
+            {% if repo.namespace == 'rpms' %}
+            <label for="epel_assignee">EPEL</label>
+            <input title="Default assignee for EPEL in bugzilla (if applicable) - Empty input resets to default"
+              class="form-control" name="epel_assignee" id="epel_assignee" value="{{
+                repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}" />
+            {% endif %}
+            <p class="pt-2">
+              These two fields allow to specify a different default assignee for ticket opened against
+              this package in bugzilla. {% if repo.namespace == 'rpms' %}Note: The EPEL field is
+              always displayed for packages in the 'rpms' namespace regardless of whether it
+              is used in bugzilla or not.{% endif %}
+            </p>
+          </div>
+          <div class="modal-footer">
+            <button class="btn btn-secondary" type="submit" title="Update bugzilla overrides" id="reset_assignees">
+               Reset to defaults
+            </button>
+            <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
+               Update
+            </button>
+          </div>
+        </form>
+      </div>
     </div>
-    {% else %}
-    <div class="col">
-      Fedora Assignee:<br>
-      {{ repo.bzoverride.fedora_assignee if repo.bzoverride.fedora_assignee else repo.user.user }}
-      <br><br>
-      EPEL Assignee:<br>
-      {{ repo.bzoverride.epel_assignee if repo.bzoverride.epel_assignee else repo.user.user }}
-    {% endif %}
   </div>
 
   <script type="text/javascript" nonce="{{ g.nonce }}">
@@ -204,28 +244,6 @@
         }
       });
 
-      $("#update_assignees").click(function(){
-              $.ajax({
-                      url: "{{ url_for('distgit_ns.bzoverride_patch_endpoint', repo=repo.name, namespace=repo.namespace) }}",
-                      type: 'post',
-                      dataType: 'json',
-                      contentType: 'application/json',
-                      data: JSON.stringify({
-                         'epel_assignee': $('#epel_assignee').val(),
-                         'fedora_assignee': $('#fedora_assignee').val()
-                      }),
-                      success: function(res) {
-                              console.log("Successfully changed the bugzilla assignees")
-                      },
-                      error: function(res) {
-                              console.log(JSON.stringify({ 'epel_assignee': $('#epel_assignee').val(), 'fedora_assignee': $('#fedora_assignee').val() }))
-                              console.log("{{ url_for('distgit_ns.bzoverride_patch_endpoint', repo=repo.name, namespace=repo.namespace) }}")
-			      console.log(res.responseText)
-			      console.log(res.getAllResponseHeaders())
-                      }
-              })
-      });
-
       {% if g.authenticated %}
       $(".monitoring-menu a").click(function(){
         var selectedValue = $(this).attr('id');
@@ -253,6 +271,49 @@
       });
       {% endif %}
 
+      $("#reset_assignees").on('click', function(){
+        $('#fedora_assignee').val('');
+        $('#epel_assignee').val('');
+        $("#change_assignees").submit();
+        return false;
+      });
+
+      $("#change_assignees").on('submit',  function(){
+        $('html').css('cursor', 'progress');
+        $('#reset_assignees').attr('disabled', true);
+        $('#update_assignees').attr('disabled', true);
+        $('#update_assignees').text('Updating...');
+        $.ajax({
+          url: "{{ url_for('distgit_ns.bzoverride_patch_endpoint', repo=repo.name, namespace=repo.namespace) }}",
+          type: 'POST',
+          dataType: 'json',
+          data: {
+             'epel_assignee': $('#epel_assignee').val(),
+             'fedora_assignee': $('#fedora_assignee').val()
+          },
+          success: function(res) {
+            console.log("Successfully changed the bugzilla assignees");
+            $("#fedora_assignee_txt").text(res.fedora_assignee);
+            $("#epel_assignee_txt").text(res.epel_assignee);
+            $('#modal_assignee').modal('hide');
+            $('#reset_assignees').attr('disabled', false);
+            $('#update_assignees').attr('disabled', false);
+            $('#update_assignees').text('Update');
+            $('html').css('cursor', 'default');
+            return false;
+          },
+          error: function(res) {
+            alert("Unable to update the bugzilla assignee(s)");
+            $('html').css('cursor', 'default');
+            $('#reset_assignees').attr('disabled', false);
+            $('#update_assignees').attr('disabled', false);
+            $('#update_assignees').text('Update');
+            return false;
+          }
+        })
+        return false;
+      });
+
       {% if g.authenticated and repo.user.user == "orphan" %}
       $("#take-orphan-button").click(function(){