From 42dc50060798082448ee81dc19e199fa922b8122 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 01 2016 08:16:16 +0000
Subject: Fix left-over from the UPLOAD_FOLDER to UPLOAD_FOLDER_URL change


The old variable was still used in one template, the test checking
that part was flawed and the test is now fixed

---

diff --git a/pagure/templates/new_release.html b/pagure/templates/new_release.html
index 6b3c766..a5187eb 100644
--- a/pagure/templates/new_release.html
+++ b/pagure/templates/new_release.html
@@ -27,7 +27,7 @@
 
 <p>
   After the upload the source will be available in the
-  <a href="{{ config['APP_URL'] + config['UPLOAD_FOLDER'] + repo.fullname }}">
+  <a href="{{ config['UPLOAD_FOLDER_URL'] + repo.fullname }}">
     release folder
   </a>.
 </p>
diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html
index 9eae4da..8efb441 100644
--- a/pagure/templates/releases.html
+++ b/pagure/templates/releases.html
@@ -8,7 +8,7 @@
 
 <h2>
   Releases
-{% if config.get('UPLOAD_FOLDER_PATH') and config.get('UPLOAD_FOLDER') %}
+{% if config.get('UPLOAD_FOLDER_PATH') and config.get('UPLOAD_FOLDER_URL') %}
   {% if g.repo_admin %}
     <a class="pull-xs-right" href="{{ url_for('.new_release',
             repo=repo.name,
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index d0aa182..5b349b0 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -930,7 +930,7 @@ def new_release(repo, username=None, namespace=None):
     """ Upload a new release.
     """
     if not APP.config.get('UPLOAD_FOLDER_PATH') \
-            and not APP.config.get('UPLOAD_FOLDER_URL'):
+            or not APP.config.get('UPLOAD_FOLDER_URL'):
         flask.abort(404)
 
     repo = flask.g.repo
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 521cfa4..edc5322 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -54,6 +54,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.path, 'tickets')
         pagure.APP.config['DOCS_FOLDER'] = os.path.join(
             self.path, 'docs')
+        pagure.APP.config['UPLOAD_FOLDER_URL'] = '/releases/'
         pagure.APP.config['UPLOAD_FOLDER_PATH'] = os.path.join(
             self.path, 'releases')
         self.app = pagure.APP.test_client()