Mercurial > farol > farol
diff farol/producttree.py @ 45:7c4d001839e7
Move the Display of the ProductTree to its own page
author | Benoît Allard <benoit.allard@greenbone.net> |
---|---|
date | Tue, 07 Oct 2014 13:01:10 +0200 |
parents | dbfe89e3c6fe |
children | ce49bd1512dd |
line wrap: on
line diff
--- a/farol/producttree.py Tue Oct 07 09:45:46 2014 +0200 +++ b/farol/producttree.py Tue Oct 07 13:01:10 2014 +0200 @@ -49,8 +49,14 @@ @document_required def create(): get_current().createProductTree() - return redirect(url_for('document.view')) + return redirect(url_for('.view')) +@producttree.route('/') +@document_required +@producttree_required +def view(): + return render_template('producttree/view.j2', + producttree=get_current()._producttree) @producttree.route('/branch/<path:path>/edit', methods=['GET', 'POST']) @document_required @@ -82,7 +88,7 @@ branch._type = request.form['type'] branch._name = request.form['name'] - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/branch/add', methods=['GET', 'POST']) @document_required @@ -99,7 +105,7 @@ pbranch = ptree.getBranch([int(p) for p in request.form['parent'].split('/')]) branch = CVRFProductBranch(request.form['type'], request.form['name'], pbranch) ptree.addBranch(branch) - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/product/<productid>') @document_required @@ -158,7 +164,7 @@ product._productid = request.form['productid'] product._name = request.form['name'] product._cpe = request.form['cpe'] or None - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/product/add', methods=['GET', 'POST']) @document_required @@ -185,7 +191,7 @@ product = CVRFFullProductName(request.form['productid'], request.form['name'], parent, request.form['cpe'] or None) ptree.addProduct(product) - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/relationship/<int:index>/edit', methods=['GET', 'POST']) @document_required @@ -204,7 +210,7 @@ rel._productreference = request.form['productreference'] rel._relationtype = request.form['relationtype'] rel._relatestoproductreference = request.form['relatestoproductreference'] - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/relationship/add', methods=['GET', 'POST']) @document_required @@ -228,7 +234,7 @@ rel = CVRFRelationship(prodid1, request.form['relationtype'], prodid2) ptree.addRelationship(rel) - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/group/<groupid>/edit', methods=['GET', 'POST']) @document_required @@ -246,7 +252,7 @@ group._productids = [] for productid in request.form.getlist('products'): group.addProductID(productid) - return redirect(url_for('document.view')) + return redirect(url_for('.view')) @producttree.route('/group/add', methods=['GET', 'POST']) @document_required @@ -260,4 +266,4 @@ for productid in request.form.getlist('products'): group.addProductID(productid) get_current()._producttree.addGroup(group) - return redirect(url_for('document.view')) + return redirect(url_for('.view'))