From ed9ad1202d31f0bb5d3abfa7f39e7433f209c379 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 05 2015 11:58:32 +0000 Subject: [PATCH 1/2] Change the URL for the upload endpoint Otherwise we conflict with the location where these releases are made available. --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 62dfef4..ab1cab8 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -645,10 +645,10 @@ def view_tags(repo, username=None): ) -@APP.route('//releases/new/', methods=('GET', 'POST')) -@APP.route('//releases/new', methods=('GET', 'POST')) -@APP.route('/fork///releases/new/', methods=('GET', 'POST')) -@APP.route('/fork///releases/new', methods=('GET', 'POST')) +@APP.route('//upload/', methods=('GET', 'POST')) +@APP.route('//upload', methods=('GET', 'POST')) +@APP.route('/fork///upload/', methods=('GET', 'POST')) +@APP.route('/fork///upload', methods=('GET', 'POST')) def new_release(repo, username=None): """ Upload a new release. """ From fc14e5b2da7f677dc147553be605f8a62d53b0ff Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 05 2015 11:59:30 +0000 Subject: [PATCH 2/2] Save the files under the name of the project, be it project or user/project --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index ab1cab8..7ed3482 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -669,7 +669,9 @@ def new_release(repo, username=None): filename = werkzeug.secure_filename(filestream.filename) try: filestream.save( - os.path.join(APP.config['UPLOAD_FOLDER_PATH'], filename)) + os.path.join(APP.config['UPLOAD_FOLDER_PATH'], + werkzeug.secure_filename(repo.fullname), + filename)) flask.flash('File uploaded') except Exception as err: # pragma: no cover APP.logger.exception(err)