From e580d4a679739c528e2212ab16d96cb9785d8e71 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 26 2014 09:34:22 +0000
Subject: Simplify the url mapping for fork related endpoints


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

---

diff --git a/progit/fork.py b/progit/fork.py
index 37658c8..02233b4 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -205,44 +205,25 @@ def do_request_pulls(repo, username=None, status=True):
 
 
 @APP.route('/<repo>/request-pulls')
-def request_pulls(repo):
-    """ Request pulling the changes from the fork into the project.
-    """
-    status = flask.request.args.get('status', True)
-    return do_request_pulls(repo, status=status)
-
-
 @APP.route('/fork/<username>/<repo>/request-pulls')
-def fork_request_pulls(username, repo):
+def request_pulls(repo, username=None):
     """ Request pulling the changes from the fork into the project.
     """
     status = flask.request.args.get('status', True)
-    return do_request_pulls(repo, username=username, status=status)
+    return do_request_pulls(repo, status=status, username=username)
 
 
 @APP.route('/<repo>/request-pull/<requestid>')
-def request_pull(repo, requestid):
-    """ Request pulling the changes from the fork into the project.
-    """
-    return do_request_pull(repo, requestid)
-
-
 @APP.route('/fork/<username>/<repo>/request-pull/<requestid>')
-def fork_request_pull(username, repo, requestid):
+def request_pull(repo, requestid, username=None):
     """ Request pulling the changes from the fork into the project.
     """
     return do_request_pull(repo, requestid, username=username)
 
 
 @APP.route('/<repo>/request-pull/merge/<requestid>')
-def merge_request_pull(repo, requestid):
-    """ Request pulling the changes from the fork into the project.
-    """
-    return do_merge_request_pull(repo, requestid)
-
-
 @APP.route('/fork/<username>/<repo>/request-pull/merge/<requestid>')
-def fork_merge_request_pull(username, repo, requestid):
+def merge_request_pull(repo, requestid, username=None):
     """ Request pulling the changes from the fork into the project.
     """
     return do_merge_request_pull(repo, requestid, username=username)
diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html
index 6694d3e..4d11864 100644
--- a/progit/templates/pull_request.html
+++ b/progit/templates/pull_request.html
@@ -22,15 +22,10 @@
 <h3>Title: {{ request.title }}</h3>
   {% if request.status %}
   <span>
-      {% if '/fork/' in request.url %}
-        <a href="{{ url_for('fork_merge_request_pull', username=username,
-                  repo=repo.name, requestid=request.id) }}" class="message">
-        {% else %}
-        <a href="{{ url_for('merge_request_pull',
-                  repo=repo.name, requestid=request.id) }}" class="message">
-        {% endif %}
-        Merge
-      </a>
+    <a href="{{ url_for('merge_request_pull', username=username,
+              repo=repo.name, requestid=request.id) }}" class="message">
+      Merge
+    </a>
   </span>
   {% else %}
   <span class="error">Merged</span>
diff --git a/progit/templates/repo_master.html b/progit/templates/repo_master.html
index aec204d..62b94b8 100644
--- a/progit/templates/repo_master.html
+++ b/progit/templates/repo_master.html
@@ -52,13 +52,10 @@
       {% endif %}
 
       <li {% if select == 'requests' %}class="selected" {% endif %}>
-        {% if '/fork/' in request.url %}
-          <a href="{{ url_for('fork_request_pulls', username=username,
-                     repo=repo.name) }}">
-        {% else %}
-          <a href="{{ url_for('request_pulls', repo=repo.name) }}">
-        {% endif %}
-              Pull-requests</a>
+        <a href="{{ url_for('request_pulls', username=username,
+                   repo=repo.name) }}">
+          Pull-requests
+        </a>
       </li>
 
       {% if repo.forks %}
diff --git a/progit/templates/requests.html b/progit/templates/requests.html
index 0ce81c7..993f47b 100644
--- a/progit/templates/requests.html
+++ b/progit/templates/requests.html
@@ -11,21 +11,13 @@
   Pull-requests
   </h2>
   {% if status and status not in [False, 'Closed'] %}
-    {% if '/fork/' in request.url %}
-        <a href="{{ url_for('fork_request_pulls', username=username,
-                   repo=repo.name) }}?status=Closed">
-      {% else %}
-        <a href="{{ url_for('request_pulls', repo=repo.name) }}?status=Closed">
-      {% endif %}
+    <a href="{{ url_for('request_pulls', username=username,
+               repo=repo.name) }}?status=Closed">
       (Closed)</a>
   {% else %}
-    {% if '/fork/' in request.url %}
-      <a href="{{ url_for('fork_request_pulls', username=username,
+    <a href="{{ url_for('request_pulls', username=username,
                  repo=repo.name) }}">
-    {% else %}
-      <a href="{{ url_for('request_pulls', repo=repo.name) }}">
-    {% endif %}
-    (Open)</a>
+      (Open)</a>
   {% endif %}
 </div>
 
@@ -35,13 +27,8 @@
     {% for request in requests %}
     <li>
       #{{ request.id }}
-      {% if '/fork/' in request.url %}
-      <a href="{{ url_for('fork_request_pull', username=username,
+      <a href="{{ url_for('request_pull', username=username,
                 repo=repo.name, requestid=request.id) }}">
-      {% else %}
-      <a href="{{ url_for('request_pull',
-                repo=repo.name, requestid=request.id) }}">
-      {% endif %}
         {{ request.title }}
       </a>
       <span> Opened by