From 0c4b0f0b23217860df4e0e0f274044c08a46274b Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Dec 05 2019 10:09:38 +0000
Subject: templates: replace old repo.username with repo.user.user on fork related url_for() arguments


---

diff --git a/pagure/templates/_render_issues.html b/pagure/templates/_render_issues.html
index 6b6bb57..dea0d16 100644
--- a/pagure/templates/_render_issues.html
+++ b/pagure/templates/_render_issues.html
@@ -17,7 +17,7 @@
                     <span class="font-weight-bold">
                         <a class="notblue" href="{{ url_for('ui_ns.view_issue',
                         repo=repo.name,
-                        username=repo.username if repo.is_fork else None,
+                        username=repo.user.user if repo.is_fork else None,
                         namespace=repo.namespace,
                         issueid=issue.id) }}">
                         {{issue.title}}
@@ -115,7 +115,7 @@
                                   class="badge badge-secondary font-90p small-badge-tag"
                                   href="{{ url_for('ui_ns.view_issues',
                                       repo=repo.name,
-                                      username=repo.username if repo.is_fork else None,
+                                      username=repo.user.user if repo.is_fork else None,
                                       namespace=repo.namespace,
                                       tags=tag.tag,
                                       milestone=filtermilestone,
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index ce2260a..f880410 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -266,7 +266,7 @@ $(document).ready(function() {
     var _url = "{{
       url_for('internal_ns.get_ticket_template',
               repo=repo.name,
-              username=repo.username if repo.is_fork else None,
+              username=repo.user.user if repo.is_fork else None,
               namespace=repo.namespace) }}";
     _url += '?template=' + _type;
     $.ajax({
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index e4471c5..a9c75cf 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -86,7 +86,7 @@
                 and not repo.settings.get('issue_tracker_read_only', False) %}
             <a href="{{ url_for('ui_ns.new_issue',
                 repo=g.repo.name,
-                username=g.repo.username if g.repo.is_fork else none,
+                username=g.repo.user.user if g.repo.is_fork else none,
                 namespace=g.repo.namespace) }}"
               class="btn btn-outline-primary btn-sm">
               <i class="fa fa-exclamation-circle fa-fw"></i> New issue</a>
diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index a9984ac..4ef4ea2 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -207,7 +207,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=repo.username if repo.is_fork else None,
+                      username=repo.user.user if repo.is_fork else None,
                       namespace=repo.namespace,
                       requestid=requestid)
                       }}" method="POST" id="ci_pr_trigger_form">
diff --git a/pagure/templates/repo_roadmap.html b/pagure/templates/repo_roadmap.html
index 129df0f..93fe903 100644
--- a/pagure/templates/repo_roadmap.html
+++ b/pagure/templates/repo_roadmap.html
@@ -49,7 +49,7 @@
                                 <a class="dropdown-item {% if milestones_status_select == 'active' %}active{%endif%}"
                                         href="{{ url_for('ui_ns.view_roadmap',
                                         repo=repo.name,
-                                        username=repo.username if repo.is_fork else None,
+                                        username=repo.user.user if repo.is_fork else None,
                                         namespace=repo.namespace,
                                        status='active',
                                        keyword=keyword,) }}">
@@ -59,7 +59,7 @@
                                 <a class="dropdown-item {% if milestones_status_select == 'inactive' %}active{%endif%}"
                                     href="{{ url_for('ui_ns.view_roadmap',
                                         repo=repo.name,
-                                        username=repo.username if repo.is_fork else None,
+                                        username=repo.user.user if repo.is_fork else None,
                                         namespace=repo.namespace,
                                         status='inactive',
                                         keyword=keyword) }}">
@@ -69,7 +69,7 @@
                                 <a class="dropdown-item {% if milestones_status_select == 'all' %}active{%endif%}"
                                         href="{{ url_for('ui_ns.view_roadmap',
                                         repo=repo.name,
-                                        username=repo.username if repo.is_fork else None,
+                                        username=repo.user.user if repo.is_fork else None,
                                         namespace=repo.namespace,
                                        status='all',
                                        keyword=keyword) }}">
@@ -211,7 +211,7 @@
             <a href="{{ url_for(
                 'ui_ns.view_milestone',
                 repo=repo.name,
-                username=repo.username if repo.is_fork else None,
+                username=repo.user.user if repo.is_fork else None,
                 namespace=repo.namespace,
                 milestone=milestone) }}"
                 class="list-group-item list-group-item-action">