From d992028b33de8407ae5d28a830686d461ba7db64 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 04 2016 08:29:05 +0000
Subject: [PATCH 1/3] Fix links to fork: to access the user's username we need to access user first


---

diff --git a/pagure/templates/user_issues.html b/pagure/templates/user_issues.html
index 04a0f8f..ec1f593 100644
--- a/pagure/templates/user_issues.html
+++ b/pagure/templates/user_issues.html
@@ -43,7 +43,7 @@
                   <a href="{{ url_for(
                       'view_issue',
                       repo=issue.project.name,
-                      username=issue.project.username if issue.project.is_fork else None,
+                      username=issue.project.user.username if issue.project.is_fork else None,
                       namespace=issue.project.namespace,
                       issueid=issue.id) }}">
                     {% if issue.private %}
@@ -61,9 +61,9 @@
                   <a href="{{ url_for(
                     'view_repo',
                     repo=issue.project.name,
-                    username=issue.project.username if issue.project.is_fork else None,
+                    username=issue.project.user.username if issue.project.is_fork else None,
                     namespace=issue.project.namespace) }}">
-                    {{ issue.project.username + '/' if issue.project.is_fork }}
+                    {{ issue.project.user.username + '/' if issue.project.is_fork }}
                     {{ issue.project.namespace + '/' if issue.project.namespace }}
                     {{ issue.project.name }}
                   </a>
diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html
index 61922cf..a1b1a48 100644
--- a/pagure/templates/user_requests.html
+++ b/pagure/templates/user_requests.html
@@ -44,7 +44,7 @@
                   <a href="{{ url_for(
                       'request_pull',
                       repo=request.project.name,
-                      username=request.project.username if request.project.is_fork else None,
+                      username=request.project.user.username if request.project.is_fork else None,
                       namespace=request.project.namespace,
                       requestid=request.id) }}">
                     {{ request.title | noJS("img") | safe }}
@@ -58,9 +58,9 @@
                   <a href="{{ url_for(
                     'view_repo',
                     repo=request.project.name,
-                    username=request.project.username if request.project.is_fork else None,
+                    username=request.project.user.username if request.project.is_fork else None,
                     namespace=request.project.namespace) }}">
-                    {{ request.project.username + '/' if request.project.is_fork }}
+                    {{ request.project.user.username + '/' if request.project.is_fork }}
                     {{ request.project.namespace + '/' if request.project.namespace }}
                     {{ request.project.name }}
                   </a>

From d00bd73ecfc5adf9745316850a9c5abefea32732 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 04 2016 08:29:05 +0000
Subject: [PATCH 2/3] Small fix in the html to avoid an almost empty line


---

diff --git a/pagure/templates/user_issues.html b/pagure/templates/user_issues.html
index ec1f593..49b70d2 100644
--- a/pagure/templates/user_issues.html
+++ b/pagure/templates/user_issues.html
@@ -32,7 +32,7 @@
         <tbody>
         {% for issue in user.issues %}
             <tr class="issue-status issue-status-{{issue.status|lower}}"
-              {%if issue.status|lower != "open" %}style="display:none;"{% endif %}>
+              {%- if issue.status|lower != "open" %} style="display:none;"{% endif %}>
                 <td class="nowrap"><span class="label label-default">#{{ issue.id }}</span></td>
                 <td><span class="label {%
                     if issue.status|lower == 'closed' %}label-danger{%

From ce6f3057bc26a3025673fba6e94adef397af6fe6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 04 2016 08:29:05 +0000
Subject: [PATCH 3/3] Expand the unit-tests on view_user_issues and view_user_requests


This should help avoiding the issue we ran into in 2.10

---

diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index 150b60d..95d1e0b 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -18,7 +18,7 @@ import os
 
 import six
 import json
-from mock import patch
+from mock import patch, MagicMock
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -923,30 +923,142 @@ class PagureFlaskApptests(tests.Modeltests):
         self.assertEqual(output.status_code, 302)
 
 
-class ViewMyRequestsTests(tests.Modeltests):
-
     def test_view_my_requests_no_user(self):
-        """Test the  endpoint."""
+        """Test the view_user_requests endpoint."""
         output = self.app.get('/user/somenonexistentuser/requests')
         self.assertEqual(output.status_code, 404)
 
+    @patch(
+        'pagure.lib.git.update_git', MagicMock(return_value=True))
+    @patch(
+        'pagure.lib.notify.send_email', MagicMock(return_value=True))
     def test_view_my_requests(self):
-        """Test the index endpoint. """
+        """Test the view_user_requests endpoint. """
+        # Create the PR
+        tests.create_projects(self.session)
+        repo = pagure.lib.get_project(self.session, 'test')
+        req = pagure.lib.new_pull_request(
+            session=self.session,
+            repo_from=repo,
+            branch_from='dev',
+            repo_to=repo,
+            branch_to='master',
+            title='test pull-request #1',
+            user='pingou',
+            requestfolder=None,
+        )
+        self.session.commit()
+        self.assertEqual(req.id, 1)
+        self.assertEqual(req.title, 'test pull-request #1')
+
         output = self.app.get('/user/pingou/requests')
         self.assertEqual(output.status_code, 200)
+        self.assertIn('test pull-request #1', output.data)
+        self.assertEqual(
+            output.data.count('<tr class="pr-status pr-status-open"'),
+            1)
 
+        # Add a PR in a fork
+        item = pagure.lib.model.Project(
+            user_id=1,  # pingou
+            name='test_fork',
+            description='test project #1',
+            is_fork=True,
+            parent_id=1,
+            hook_token='aaabbbttt',
+        )
+        self.session.add(item)
+        repo = pagure.lib.get_project(
+            self.session, 'test_fork', user='pingou')
+
+        req = pagure.lib.new_pull_request(
+            session=self.session,
+            repo_from=repo,
+            branch_from='dev',
+            repo_to=repo,
+            branch_to='master',
+            title='test pull-request #2',
+            user='pingou',
+            requestfolder=None,
+        )
+        self.session.commit()
+        self.assertEqual(req.id, 1)
+        self.assertEqual(req.title, 'test pull-request #2')
 
-class ViewMyIssuesTests(tests.Modeltests):
+        output = self.app.get('/user/pingou/requests')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn('test pull-request #1', output.data)
+        self.assertIn('test pull-request #2', output.data)
+        self.assertEqual(
+            output.data.count('<tr class="pr-status pr-status-open"'),
+            2)
 
     def test_view_my_issues_no_user(self):
-        """Test the endpoint returns 404 with a missing user."""
+        """Test the view_user_issues endpoint with a missing user."""
         output = self.app.get('/user/somenonexistentuser/issues')
         self.assertEqual(output.status_code, 404)
 
+    @patch(
+        'pagure.lib.git.update_git', MagicMock(return_value=True))
+    @patch(
+        'pagure.lib.notify.send_email', MagicMock(return_value=True))
     def test_view_my_issues(self):
-        """Test the endpoint returns 200 when the user exists."""
+        """Test the view_user_issues endpoint when the user exists."""
+        # Create the issue
+        tests.create_projects(self.session)
+        repo = pagure.lib.get_project(self.session, 'test')
+        msg = pagure.lib.new_issue(
+            session=self.session,
+            repo=repo,
+            title='Test issue #1',
+            content='We should work on this for the second time',
+            user='pingou',
+            status='Open',
+            ticketfolder=None
+        )
+        self.session.commit()
+        self.assertEqual(msg.title, 'Test issue #1')
+
+        output = self.app.get('/user/pingou/issues')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn('Test issue #1', output.data)
+        self.assertEqual(
+            output.data.count('<tr class="issue-status issue-status-open"'),
+            1)
+
+        # Add an issue in a fork
+        item = pagure.lib.model.Project(
+            user_id=2,  # foo
+            name='test_fork',
+            description='test project #1',
+            is_fork=True,
+            parent_id=1,
+            hook_token='aaabbbttt',
+        )
+        self.session.add(item)
+        repo = pagure.lib.get_project(self.session, 'test_fork', user='foo')
+
+        msg = pagure.lib.new_issue(
+            session=self.session,
+            repo=repo,
+            title='Test issue #2',
+            content='We should work on this for the second time',
+            user='pingou',
+            status='Open',
+            ticketfolder=None
+        )
+        self.session.commit()
+        self.assertEqual(msg.title, 'Test issue #2')
+
+
         output = self.app.get('/user/pingou/issues')
+        print output.data
         self.assertEqual(output.status_code, 200)
+        self.assertIn('Test issue #1', output.data)
+        self.assertIn('Test issue #2', output.data)
+        self.assertEqual(
+            output.data.count('<tr class="issue-status issue-status-open"'),
+            2)
 
 
 if __name__ == '__main__':