Commit 7f308165 authored by Pieter-Jan Moreels's avatar Pieter-Jan Moreels
Browse files

Merge remote-tracking branch 'upstream/master'

parents 51dcc05b b7efcc4a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
#
# Manager for the database
#
# Copyright (c) 2012 		Wim Remens
# Copyright (c) 2012 		Wim Remes
# Copyright (c) 2012-2014 	Alexandre Dulaunoy - a@foo.be
# Copyright (c) 2014-2015 	Pieter-Jan Moreels - pieterjan.moreels@gmail.com

+2 −2
Original line number Diff line number Diff line
@@ -269,10 +269,10 @@ def capec(capecid):
@app.route('/search', methods=['POST'])
def searchText():
    search = request.form.get('search')
    result = db.getSearchResults(search)
    result = dbLayer.getSearchResults(search)
    cve=result['data']
    errors=result['errors'] if 'errors' in result else []
    return render_template('search.html', cve=cve, errors=errors)
    return render_template('search.html', cve=cve, errors=errors, minimal=True)


@app.route('/search/<vendor>/<path:product>')