From 106d06c8174b0bea716ca57b6d9efc603933474c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 30 2018 09:41:17 +0000
Subject: Fix uploading an image when opening a new ticket


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

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

---

diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 0f8d423..89acc44 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -1114,7 +1114,7 @@ def new_issue(repo, username=None, namespace=None):
                             repo=repo.name,
                             username=username,
                             namespace=repo.namespace,
-                            filename=new_filename,
+                            filename='files/%s' % new_filename,
                         )
                         new_filename = new_filename.split('-', 1)[1]
                         url = '[![%s](%s)](%s)' % (
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index c14c124..d6dfc63 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -194,7 +194,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             # Check the image was uploaded
             self.assertIn(
-                'href="/test/issue/raw/'
+                'href="/test/issue/raw/files/'
                 '8a06845923010b27bfd8e7e75acff7badc40d1021b4'
                 '994e01f5e11ca40bc3abe',
                 output_text)
@@ -285,7 +285,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             # Check the image was uploaded
             self.assertIn(
-                'href="/somenamespace/test3/issue/raw/'
+                'href="/somenamespace/test3/issue/raw/files/'
                 '8a06845923010b27bfd8e7e75acff7badc40d1021b4'
                 '994e01f5e11ca40bc3abe',
                 output_text)
@@ -344,16 +344,26 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             # Check the image was uploaded
             self.assertIn(
-                'href="/test/issue/raw/'
+                'href="/test/issue/raw/files/'
                 '8a06845923010b27bfd8e7e75acff7badc40d1021b4'
                 '994e01f5e11ca40bc3abe',
                 output_text)
             self.assertIn(
-                'href="/test/issue/raw/'
+                'href="/test/issue/raw/files/'
                 '6498a2de405546200b6144da56fc25d0a3976ae688d'
                 'bfccaca609c8b4480523e',
                 output_text)
 
+            # Check that the files are accessible
+            _, full_name = output_text.split("/test/issue/raw/files/", 1)
+            full_name1, full_name2 = full_name.split(
+                "/test/issue/raw/files/", 1)
+            full_name1 = full_name1.split(".png", 1)[0]
+            full_name2 = full_name2.split(".png", 1)[0]
+            for full_name in [full_name1, full_name2]:
+                req = self.app.get("/test/issue/raw/files/%s.png" % full_name)
+                self.assertEqual(req.status_code, 200)
+
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
     def test_new_issue_w_files_namespace(self, p_send_email, p_ugt):
@@ -411,12 +421,12 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             # Check the image was uploaded
             self.assertIn(
-                'href="/somenamespace/test3/issue/raw/'
+                'href="/somenamespace/test3/issue/raw/files/'
                 '8a06845923010b27bfd8e7e75acff7badc40d1021b4'
                 '994e01f5e11ca40bc3abe',
                 output_text)
             self.assertIn(
-                'href="/somenamespace/test3/issue/raw/'
+                'href="/somenamespace/test3/issue/raw/files/'
                 '6498a2de405546200b6144da56fc25d0a3976ae688d'
                 'bfccaca609c8b4480523e',
                 output_text)