diff --git a/hubsrht/blueprints/mailing_lists.py b/hubsrht/blueprints/mailing_lists.py index 2cab1e2..17bb892 100644 --- a/hubsrht/blueprints/mailing_lists.py +++ b/hubsrht/blueprints/mailing_lists.py @@ -67,13 +67,13 @@ def new_POST(owner, project_name): break if not list_name: search = valid.optional("search") - mls = lists.get_list(owner) + mls = lists.get_lists(owner) # TODO: Search properly mls = filter(lambda r: search.lower() in r["name"].lower(), mls) mls = sorted(mls, key=lambda r: r["updated"], reverse=True) return render_template("mailing-list-new.html", view="new-resource", owner=owner, project=project, - lists=mls) + lists=mls, search=search) mailing_list = lists.get_list(owner, list_name) ml = MailingList() diff --git a/hubsrht/blueprints/trackers.py b/hubsrht/blueprints/trackers.py index bc541f2..064cee1 100644 --- a/hubsrht/blueprints/trackers.py +++ b/hubsrht/blueprints/trackers.py @@ -59,9 +59,10 @@ def new_POST(owner, project_name): if not tracker_name: search = valid.optional("search") trackers = todo.get_trackers(owner) - # TODO: Search properly - tracker = filter(lambda r: search.lower() in r["name"].lower(), trackers) - tracker = sorted(trackers, key=lambda r: r["updated"], reverse=True) + trackers = filter(lambda r: + search.lower() in r["name"].lower() + or search.lower() in r["description"].lower(), trackers) + trackers = sorted(trackers, key=lambda r: r["updated"], reverse=True) return render_template("tracker-new.html", view="new-resource", owner=owner, project=project, trackers=trackers, search=search) diff --git a/hubsrht/templates/mailing-list-new.html b/hubsrht/templates/mailing-list-new.html index 7191efa..cd74624 100644 --- a/hubsrht/templates/mailing-list-new.html +++ b/hubsrht/templates/mailing-list-new.html @@ -1,151 +1,154 @@ {% extends "resource-new.html" %} {% block content %} -