Mercurial > farol > farol
comparison farol/document.py @ 61:55b72057b066
Unify reference update/creation from forms
| author | Benoît Allard <benoit.allard@greenbone.net> |
|---|---|
| date | Wed, 08 Oct 2014 12:06:50 +0200 |
| parents | c6e7175ff28c |
| children | ce49bd1512dd |
comparison
equal
deleted
inserted
replaced
| 60:c6e7175ff28c | 61:55b72057b066 |
|---|---|
| 30 CVRFPublisher, CVRFTracking, CVRFTrackingID, CVRFGenerator, CVRFRevision, | 30 CVRFPublisher, CVRFTracking, CVRFTrackingID, CVRFGenerator, CVRFRevision, |
| 31 CVRFAggregateSeverity) | 31 CVRFAggregateSeverity) |
| 32 from farolluz.renderer import utcnow | 32 from farolluz.renderer import utcnow |
| 33 | 33 |
| 34 from .controller import (update_note_from_request, create_note_from_request, | 34 from .controller import (update_note_from_request, create_note_from_request, |
| 35 update_reference_from_request, create_reference_from_request, | |
| 35 update_acknowledgment_from_request, create_acknowledgment_from_request) | 36 update_acknowledgment_from_request, create_acknowledgment_from_request) |
| 36 from .session import document_required, get_current | 37 from .session import document_required, get_current |
| 37 | 38 |
| 38 | 39 |
| 39 document = Blueprint('document', __name__) | 40 document = Blueprint('document', __name__) |
| 207 except IndexError: | 208 except IndexError: |
| 208 abort(404) | 209 abort(404) |
| 209 if request.method != 'POST': | 210 if request.method != 'POST': |
| 210 return render_template('document/edit_reference.j2', _type=ref._type, url=ref._url, description=ref._description, types=('',) + ref.TYPES) | 211 return render_template('document/edit_reference.j2', _type=ref._type, url=ref._url, description=ref._description, types=('',) + ref.TYPES) |
| 211 | 212 |
| 212 ref._type = request.form['type'] or None | 213 update_reference_from_request(ref) |
| 213 ref._url = request.form['url'] | |
| 214 ref._description = request.form['description'] | |
| 215 return redirect(url_for('.view')) | 214 return redirect(url_for('.view')) |
| 216 | 215 |
| 217 | 216 |
| 218 @document.route('/reference/add', methods=['GET', 'POST']) | 217 @document.route('/reference/add', methods=['GET', 'POST']) |
| 219 @document_required | 218 @document_required |
| 220 def add_reference(): | 219 def add_reference(): |
| 221 if request.method != 'POST': | 220 if request.method != 'POST': |
| 222 return render_template('document/edit_reference.j2', action='Add', types=('',) + CVRFReference.TYPES) | 221 return render_template('document/edit_reference.j2', action='Add', types=('',) + CVRFReference.TYPES) |
| 223 | 222 |
| 224 ref = CVRFReference(request.form['url'], request.form['description'], request.form['type'] or None) | 223 ref = create_reference_from_request() |
| 225 get_current().addReference(ref) | 224 get_current().addReference(ref) |
| 226 return redirect(url_for('.view')) | 225 return redirect(url_for('.view')) |
| 227 | 226 |
| 228 @document.route('/acknowledgment/<int:index>') | 227 @document.route('/acknowledgment/<int:index>') |
| 229 @document_required | 228 @document_required |