Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit cf27a994b3885aac31cd2f2f816a0e541bc66fb8 Author: Valentin Gologuzov vgologuz@redhat.com Date: Wed Sep 30 11:21:27 2015 +0200
[frontend][rhbz: #1266750] Unable to view second, third, … page of search results: " Search string must have at least 3 characters "
frontend/coprs_frontend/coprs/helpers.py | 6 +++++- .../coprs/views/coprs_ns/coprs_general.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/helpers.py b/frontend/coprs_frontend/coprs/helpers.py index f3406b4..ef1a504 100644 --- a/frontend/coprs_frontend/coprs/helpers.py +++ b/frontend/coprs_frontend/coprs/helpers.py @@ -110,13 +110,16 @@ class FailTypeEnum(object): class Paginator(object):
def __init__(self, query, total_count, page=1, - per_page_override=None, urls_count_override=None): + per_page_override=None, urls_count_override=None, + additional_params=None):
self.query = query self.total_count = total_count self.page = page self.per_page = per_page_override or constants.ITEMS_PER_PAGE self.urls_count = urls_count_override or constants.PAGES_URLS_COUNT + self.additional_params = additional_params or dict() + self._sliced_query = None
def page_slice(self, page): @@ -155,6 +158,7 @@ class Paginator(object): def url_for_other_page(self, request, page): args = request.view_args.copy() args["page"] = page + args.update(self.additional_params) return flask.url_for(request.endpoint, **args)
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 2891ca8..6c14138 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -123,7 +123,8 @@ def coprs_fulltext_search(page=1): return flask.redirect(flask.request.referrer or flask.url_for("coprs_ns.coprs_show"))
- paginator = helpers.Paginator(query, query.count(), page) + paginator = helpers.Paginator(query, query.count(), page, + additional_params={"fulltext": fulltext})
coprs = paginator.sliced_query return render_template("coprs/show/fulltext.html", coprs=coprs, @@ -358,6 +359,7 @@ def _check_rpmfusion(repos): message = flask.Markup('Using rpmfusion as dependency is nearly always wrong. Please see <a href="https://fedorahosted.org/copr/wiki/UserDocs#WhatIcanbuildinCopr">What I can build in Copr</a>.') flask.flash(message, "error")
+ @coprs_ns.route("/<username>/<coprname>/update/", methods=["POST"]) @login_required def copr_update(username, coprname):
copr-commits@lists.fedorahosted.org