From 22115dad39566e1dcb0a4014dcc65fb9caddc91b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 07 2016 13:11:30 +0000
Subject: [PATCH 1/4] Include the issue title in the title of the page


Fixes https://pagure.io/pagure/issue/708

---

diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 0417899..e887bd4 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -1,7 +1,7 @@
 {% extends "repo_master.html" %}
 {% from "_formhelper.html" import render_field, render_bootstrap_field, show_comment, show_initial_comment %}
 
-{% block title %}Issue #{{ issueid }} - {{ repo.name }}{% endblock %}
+{% block title %}Issue #{{ issueid }}: {{issue.title | noJS("img") | safe }} - {{ repo.name }}{% endblock %}
 {% set tag = "home"%}
 
 {% block header %}
@@ -92,7 +92,10 @@
             </div>
         </form>
         {% else %}
-          <p><a href="{{ url_for('auth_login', next=request.url) }}">Login</a> to comment on this ticket.</p>
+          <p>
+            <a href="{{ url_for('auth_login', next=request.url) }}">Login</a>
+            to comment on this ticket.
+          </p>
         {% endif %}
         </section>
 
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 79a0423..f12e607 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -3,7 +3,7 @@
 
 {% block title %}
   {%- if pull_request -%}
-    PR#{{ requestid }}: {{ pull_request.title }} - {{ repo.name }}
+    PR#{{ requestid }}: {{ pull_request.title | noJS(ignore="img")}} - {{ repo.name }}
   {% elif form and (repo_admin or remote_git) %}
     Create new Pull Request for {{ branch_to }} - {{ repo.name }}
   {%- else -%}

From 744ae783c4b8aa869da68fff84a7df06eac59cde Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 07 2016 13:11:30 +0000
Subject: [PATCH 2/4] Adjust the unit-tests for the change in the title of the issue page


---

diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index fab24c2..99f3aa9 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -127,7 +127,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/new_issue', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -184,7 +185,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -308,9 +310,10 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertNotIn(
             '<a class="btn btn-secondary btn-sm" href="/test/issue/1/edit">',
             output.data)
+        print output.data
         self.assertTrue(
-            '<p><a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1'
-            '">Login</a> to comment on this ticket.</p>'
+            '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'
+            'Login</a>\n            to comment on this ticket.'
             in output.data)
 
         user = tests.FakeUser()
@@ -322,7 +325,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             '<a class="btn btn-secondary btn-sm" href="/test/issue/1/edit">',
             output.data)
             self.assertFalse(
-                '<p><a href="/login/">Login</a> to comment on this ticket.</p>'
+                '<a href="/login/">Login</a> to comment on this ticket.'
                 in output.data)
 
         user.username = 'pingou'
@@ -366,7 +369,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/2')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #2 - test - Pagure</title>', output.data)
+                '<title>Issue #2: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<span class="oi red-icon" data-glyph="lock-locked" '
                 'title="Private issue"></span>', output.data)
@@ -417,7 +421,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -441,7 +446,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -454,7 +460,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -467,7 +474,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -488,7 +496,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -515,7 +524,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -542,7 +552,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -566,7 +577,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -613,7 +625,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/2/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #2 - test - Pagure</title>', output.data)
+                '<title>Issue #2: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/2/edit">', output.data)
@@ -688,7 +701,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -705,7 +719,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -745,7 +760,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -802,7 +818,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -819,7 +836,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -836,7 +854,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -888,7 +907,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -905,7 +925,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -922,7 +943,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -965,7 +987,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -1418,7 +1441,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/drop', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -1431,7 +1455,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/drop', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
 
             data['csrf_token'] = csrf_token
             output = self.app.post(
@@ -1481,7 +1506,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -1498,7 +1524,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -1540,7 +1567,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)
@@ -1576,7 +1604,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Issue #1 - test - Pagure</title>', output.data)
+                '<title>Issue #1: Test issue - test - Pagure</title>',
+                output.data)
             self.assertIn(
                 '<a class="btn btn-secondary btn-sm" '
                 'href="/test/issue/1/edit">', output.data)

From 37edf8f9a28b43dfc1bf0c061b9dbdf07b749ea5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 07 2016 13:11:30 +0000
Subject: [PATCH 3/4] Remove debugging print


---

diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 99f3aa9..eb87a9c 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -310,7 +310,6 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertNotIn(
             '<a class="btn btn-secondary btn-sm" href="/test/issue/1/edit">',
             output.data)
-        print output.data
         self.assertTrue(
             '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'
             'Login</a>\n            to comment on this ticket.'

From 5d55e61863c7d427ea820d398adefc6edffe25cd Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 07 2016 13:11:30 +0000
Subject: [PATCH 4/4] Be consistent in the way we call the noJS filter


---

diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index e887bd4..2a0c445 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -1,7 +1,7 @@
 {% extends "repo_master.html" %}
 {% from "_formhelper.html" import render_field, render_bootstrap_field, show_comment, show_initial_comment %}
 
-{% block title %}Issue #{{ issueid }}: {{issue.title | noJS("img") | safe }} - {{ repo.name }}{% endblock %}
+{% block title %}Issue #{{ issueid }}: {{issue.title | noJS(ignore="img") | safe }} - {{ repo.name }}{% endblock %}
 {% set tag = "home"%}
 
 {% block header %}