From c2ec01a3a8ca967bdadf49ca61677f15cfba8e57 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Sep 24 2018 13:52:19 +0000
Subject: [PATCH 1/2] put users search box back in the user listing page


Fixes #3638

---

diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html
index 723aec4..1be1065 100644
--- a/pagure/templates/user_list.html
+++ b/pagure/templates/user_list.html
@@ -3,6 +3,8 @@
 {% set tag = "users" %}
 {% from "_browseheader.html" import browse_header %}
 {% from "_projectstring.html" import projectstring, projecticon %}
+{% from "_render_repo.html" import searchbox %}
+
 
 {% block header %}
 <link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
@@ -21,15 +23,11 @@
   <div class="col">
     <h3 class="mb-3 font-weight-bold">
       Users <span class="badge badge-secondary">{{ users_length }}</span>
-      {%- if g.authenticated and config.get('PAGURE_AUTH') == 'local' %}
-      <a href="{{ url_for('ui_ns.new_user') }}">
-      <button type="button" class="btn btn-outline-success float-right">
-          New User
-      </button>
-      </a>
-      {% endif -%}
+      <div class="pull-right">
+        {{searchbox(select="users")}}
+      </div>
     </h3>
-    <div class="row">
+    <div class="row mt-5">
     {% for user in users %}
       <div class="col-lg-4 col-md-6">
         <div class="border mb-4">

From 7258a81cab42560afeee376b575bae298a96e0c4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 24 2018 16:22:22 +0000
Subject: [PATCH 2/2] Fix unit-tests for the re-introduction of the search bar for users


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

---

diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index 7ec343e..830648e 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -62,7 +62,7 @@ class PagureFlaskApptests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<h3 class="mb-3 font-weight-bold">\n      Users '
-            '<span class="badge badge-secondary">2</span></h3>', output_text)
+            '<span class="badge badge-secondary">2</span>', output_text)
         self.assertIn(
             '<a href="/user/pingou">\n                  '
             '<div class="nowrap"><strong>pingou</strong>',