Don't require attachments to attach a mail thread to an existing patch

We still require attachments to create a new patch, but it should be
possible to attach a pure discussion thread to an existing patch.

diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
index 08d86a27539f63368623b5597fbf59f34e8cb8cc..d32ce916bfe04fcedef4661b93fa38bccbf1e587 100644 (file)
--- a/pgcommitfest/commitfest/ajax.py
+++ b/pgcommitfest/commitfest/ajax.py
@@ -47,9 +47,10 @@ def _archivesAPI(suburl, params=None):
 
 def getThreads(request):
        search = request.GET.has_key('s') and request.GET['s'] or None
+       attachonly = request.GET.has_key('a') and 1 or 0
 
        # Make a JSON api call to the archives server
-       params = {'n': 100, 'a': 1}
+       params = {'n': 100, 'a': attachonly}
        if search:
                params['s'] = search
 

diff --git a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
index 0ca6316ff60b681110b9f9cbb90b47529204c4fb..972dd67677c6e2e402fdff8cf386b983a15ba0c4 100644 (file)
--- a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
+++ b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
@@ -10,6 +10,7 @@ function findLatestThreads() {
    $('#attachThreadSearchButton').addClass('disabled');
    $.get('/ajax/getThreads/', {
       's': $('#attachThreadSearchField').val(),
+      'a': $('#attachThreadAttachOnly').val(),
    }).success(function(data) {
          sel = $('#attachThreadList');
          sel.find('option').remove();

diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index ab07ecfc44254323bc3dd74dd923430ca0d22f99..ac42f43faa12ec1a5fcc72e9441a6b52fc413a99 100644 (file)
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -105,6 +105,7 @@ $(document).ready(function() {
    $('button.attachThreadButton').each(function (i,o) {
       var b = $(o);
       b.click(function() {
+        $('#attachThreadAttachOnly').val('1');
          browseThreads(function(msgid) {
             b.prev().val(msgid);
             return true;

diff --git a/pgcommitfest/commitfest/templates/thread_attach.inc b/pgcommitfest/commitfest/templates/thread_attach.inc
index 3322ba8a80f7b0893805bfa794fb5f47e53124c9..44c4316856dd71471db52520e80d6c1bf8cb4c40 100644 (file)
--- a/pgcommitfest/commitfest/templates/thread_attach.inc
+++ b/pgcommitfest/commitfest/templates/thread_attach.inc
@@ -20,6 +20,7 @@
  </div>
  <div class="modal-body">
    <form class="form-inline" style="margin-bottom: 5px;">
+     <input type="hidden" id="attachThreadAttachOnly" value="0">
      <div class="input-append">
        <input id="attachThreadSearchField" type="text" class="span2 search-query">
        <button id="attachThreadSearchButton" onclick="return findLatestThreads()" class="btn btn-default disabled">Search</button>