From 04eb13699baa9e5476b1eece2bf6b3e197c8794f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 25 2019 10:12:10 +0000
Subject: Fix the username in the PR template


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

---

diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index e73268b..8d3e99e 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -43,7 +43,7 @@
                      href="{{ url_for(
                       'ui_ns.request_pull_edit',
                       repo=repo.name,
-                      username=username,
+                      username=repo.user.user if repo.is_fork else None,
                       namespace=repo.namespace,
                       requestid=requestid) }}"
                      title="Update title"><i class="fa fa-pencil"></i></a>
@@ -138,7 +138,8 @@
               (g.repo_committer or g.fas_user.username == pull_request.user.username) %}
                 {% if mergeform and pull_request.remote %}
                   <form style="display:inline;" action="{{ url_for(
-                    'ui_ns.refresh_request_pull', username=username,
+                    'ui_ns.refresh_request_pull',
+                    username=repo.user.user if repo.is_fork else None,
                     namespace=repo.namespace,
                     repo=repo.name, requestid=requestid) }}" method="POST">
                       <button type="submit" value="Refresh" id="refresh_pr"
@@ -150,7 +151,8 @@
                 {% endif %}
 
               <form style="display:inline;" action="{{ url_for(
-                  'ui_ns.close_request_pull', username=username,
+                  'ui_ns.close_request_pull',
+                  username=repo.user.user if repo.is_fork else None,
                   namespace=repo.namespace,
                   repo=repo.name, requestid=requestid) }}" method="POST">
            {% endif %}
@@ -181,7 +183,7 @@
                 <small id="merge-alert-message"></small>
                 <form action="{{ url_for('ui_ns.merge_request_pull',
                         repo=repo.name,
-                        username=username,
+                        username=repo.user.user if repo.is_fork else None,
                         namespace=repo.namespace,
                         requestid=requestid)
                   }}" method="POST"  id="merge_pr_form">
@@ -212,7 +214,7 @@
           <div class="text-xs-center dropdown-menu dropdown-menu-right p-0">
             <form action="{{ url_for('ui_ns.ci_trigger_request_pull',
                     repo=repo.name,
-                    username=username,
+                    username=repo.username if repo.is_fork else None,
                     namespace=repo.namespace,
                     requestid=requestid)
               }}" method="POST" id="ci_pr_trigger_form">
@@ -231,7 +233,8 @@
       {% if pull_request.status == 'Closed' and g.authenticated and
       (g.repo_committer or g.fas_user.username == pull_request.user.username) %}
       <form action="{{ url_for(
-            'ui_ns.reopen_request_pull', username=username,
+            'ui_ns.reopen_request_pull',
+            username=repo.user.user if repo.is_fork else None,
             namespace=repo.namespace,
             repo=repo.name, requestid=requestid) }}" method="POST">
       {{ mergeform.csrf_token }}
@@ -276,7 +279,7 @@
     <a class="nav-link" href="{{ url_for(
         'ui_ns.request_pull_patch',
         repo=repo.name,
-        username=username,
+        username=repo.user.user if repo.is_fork else None,
         namespace=repo.namespace,
         requestid=requestid) }}">
       <span class="hidden-sm-down">Patch</span>
@@ -305,11 +308,13 @@
             {% else %}
               {% set commit_link = url_for('ui_ns.view_commit',
                         repo=repo.name,
-                        username=username,
+                        username=repo.user.user if repo.is_fork else None,
                         namespace=repo.namespace,
                         commitid=commit.oid.hex) %}
               {% set tree_link = url_for(
-                'ui_ns.view_tree', username=username, namespace=repo.namespace,
+                'ui_ns.view_tree',
+                username=repo.user.user if repo.is_fork else None,
+                namespace=repo.namespace,
                 repo=repo.name, identifier=commit.hex) %}
             {% endif %}
             <div class="list-group-item">
@@ -327,7 +332,7 @@
                       link=url_for('ui_ns.view_commits',
                           repo=repo.name,
                           branchname=branchname,
-                          username=username,
+                          username=repo.user.user if repo.is_fork else None,
                           namespace=repo.namespace,
                           author=commit.author.email),
                       cssclass="notblue")|safe}}
@@ -357,7 +362,7 @@
     {% if g.authenticated %}
     <form action="{{ url_for('ui_ns.pull_request_drop_comment',
             repo=repo.name,
-            username=username,
+            username=repo.user.user if repo.is_fork else None,
             namespace=repo.namespace,
             requestid=requestid)
         }}" method="post" class="icon"
@@ -383,7 +388,7 @@
     <section class="request_comment" >
       <form action="{{ url_for('ui_ns.pull_request_drop_comment',
             repo=repo.name,
-            username=username,
+            username=repo.user.user if repo.is_fork else None,
             namespace=repo.namespace,
             requestid=requestid)
           }}" method="post" id="request_comment"
@@ -442,7 +447,7 @@
       <form action="{{ url_for(
         'ui_ns.pull_request_add_comment',
         repo=repo.name,
-        username=username,
+        username=repo.user.user if repo.is_fork else None,
         namespace=repo.namespace,
         requestid=requestid) }}"
         method="post" onsubmit="return try_async_comment(this, false)">
@@ -496,7 +501,7 @@
         {% if g.authenticated and mergeform and g.repo_user %}
           <form method="POST" action="{{ url_for('ui_ns.update_pull_requests',
               repo=repo.name,
-              username=username,
+              username=repo.user.user if repo.is_fork else None,
               namespace=repo.namespace,
               requestid=requestid) }}">
             <fieldset class="form-group issue-metadata-form hidden">
@@ -566,7 +571,7 @@
                   class="badge badge-primary text-left my-1 p-2"
                   href="{{ url_for('ui_ns.request_pulls',
                       repo=repo.name,
-                      username=username,
+                      username=repo.user.user if repo.is_fork else None,
                       namespace=repo.namespace,
                       tags=tag.tag) }}">
                   {{ tag.tag }}
@@ -970,7 +975,8 @@ $(document).ready(function() {
     onChange:     function(value) {
       if (value != ""){
         var sel = $('#branch_select');
-        var final_url = "{{ url_for('ui_ns.new_request_pull', username=username,
+        var final_url = "{{ url_for('ui_ns.new_request_pull',
+          username=repo.user.user if repo.is_fork else None,
           namespace=repo.namespace, repo=repo.name,
           branch_from=branch_from, branch_to='--', project_to=project_to) }}";
         final_url = final_url.replace('--', sel.val());
@@ -986,7 +992,8 @@ $(document).ready(function() {
     onChange:     function(value) {
       if (value != ""){
         var sel = $('#branch_from_select');
-        var final_url = "{{ url_for('ui_ns.new_request_pull', username=username,
+        var final_url = "{{ url_for('ui_ns.new_request_pull',
+          username=repo.user.user if repo.is_fork else None,
           namespace=repo.namespace, repo=repo.name,
           branch_from='--', branch_to=branch_to, project_to=project_to) }}";
         final_url = final_url.replace('--', sel.val());
@@ -1046,7 +1053,7 @@ $(document).ready(function() {
       var url = "{{ url_for(
         'ui_ns.pull_request_add_comment',
         repo=repo.name,
-        username=username,
+        username=repo.user.user if repo.is_fork else None,
         namespace=repo.namespace,
         requestid=requestid, commit='', filename='', row='') }}".slice(0, -2);
       url = url + commit + '/' + filename + '/' + row
@@ -1338,7 +1345,7 @@ $(document).ready(function () {
       var _url = "{{ url_for(
         'api_ns.api_subscribe_pull_request',
         repo=repo.name,
-        username=username,
+        username=repo.user.user if repo.is_fork else None,
         namespace=repo.namespace,
         requestid=pull_request.id
         ) }}";
@@ -1451,7 +1458,7 @@ $(document).ready(function () {
     {%- if g.issues_enabled %}
     $.get("{{ url_for('api_ns.api_view_issues',
                 repo=repo.name,
-                username=username,
+                username=repo.user.user if repo.is_fork else None,
                 namespace=repo.namespace,
                 status='all') }}"),
     {%- else %}
@@ -1460,7 +1467,7 @@ $(document).ready(function () {
     {%- if repo.settings.get('pull_requests', True) %}
     $.get("{{ url_for('api_ns.api_pull_request_views',
                 repo=repo.name,
-                username=username,
+                username=repo.user.user if repo.is_fork else None,
                 namespace=repo.namespace,
                 status='all') }}")
     {%- else %}