From a7063acf865a42298ce101ccb8beb253d647fa9b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 09 2017 13:16:59 +0000
Subject: Fix endpoints and function fixing the unit-tests


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 8921620..3071a28 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -914,6 +914,7 @@ function showTab(){
   $('#pr-tabs a[href="#request_diff"]').tab('show')
 }
 
+{% if pull_request %}
 function show_merge_status(){
   function process_response(res) {
       $('#spinner').hide();
@@ -961,6 +962,7 @@ function show_merge_status(){
   });
   return false;
 }
+{% endif %}
 
 $(document).ready(function() {
 
diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html
index d572e9d..23c044a 100644
--- a/pagure/templates/user_settings.html
+++ b/pagure/templates/user_settings.html
@@ -84,7 +84,7 @@
       <div class="card-header">
         <strong>Email Addresses</strong>
             <a class="btn btn-success btn-sm pull-xs-right" href="{{
-                url_for('add_api_user_email') }}">
+                url_for('add_user_email') }}">
                   Add Email
             </a>
       </div>
@@ -237,7 +237,7 @@
       </ul>
       {% endif %}
       <div class="card-block">
-        <a href="{{ url_for('.add_user_token') }}" method="post" class="icon">
+        <a href="{{ url_for('.add_api_user_token') }}" method="post" class="icon">
         <button class="btn btn-primary" type="submit"
           title="Generate a new API token">
           Create new key