From 3887318d8f62d5cea5d3ff9c6e87c320d69a458c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 07 2017 09:53:02 +0000
Subject: Fixes path to the files uploaded or linked to


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

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 6d79166..55b36fa 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -871,7 +871,7 @@ def _add_file_to_git(repo, issue, attachmentfolder, ticketfolder, user,
         os.mkdir(folder_path)
 
     # Copy from attachments directory
-    src = os.path.join(attachmentfolder, repo.fullname, filename)
+    src = os.path.join(attachmentfolder, repo.fullname, 'files', filename)
     shutil.copyfile(src, file_path)
 
     # Retrieve the list of files that changed
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index deb93c9..e5337c9 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -1251,7 +1251,6 @@ def upload_issue(repo, issueid, username=None, namespace=None):
     if form.validate_on_submit():
         filenames = []
         for filestream in flask.request.files.getlist('filestream'):
-            filenames.append(filestream.filename)
             new_filename = pagure.lib.add_attachment(
                 repo=repo,
                 issue=issue,
@@ -1260,6 +1259,7 @@ def upload_issue(repo, issueid, username=None, namespace=None):
                 filename=filestream.filename,
                 filestream=filestream.stream,
             )
+            filenames.append(new_filename)
 
         return flask.jsonify({
             'output': 'ok',
@@ -1272,7 +1272,7 @@ def upload_issue(repo, issueid, username=None, namespace=None):
                     repo=repo.name,
                     username=username,
                     namespace=repo.namespace,
-                    filename=new_filename,
+                    filename='files/%s' % new_filename,
                 )
                 for new_filename in filenames
             ]