Mercurial > farol > farol
comparison farol/document.py @ 60:c6e7175ff28c
Unify acknowledgments update/creation from forms
| author | Benoît Allard <benoit.allard@greenbone.net> |
|---|---|
| date | Wed, 08 Oct 2014 11:58:33 +0200 |
| parents | fbc413b8a46e |
| children | 55b72057b066 |
comparison
equal
deleted
inserted
replaced
| 59:64403f1b424e | 60:c6e7175ff28c |
|---|---|
| 29 from farolluz.cvrf import (CVRFNote, CVRFReference, CVRFAcknowledgment, | 29 from farolluz.cvrf import (CVRFNote, CVRFReference, CVRFAcknowledgment, |
| 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_acknowledgment_from_request, create_acknowledgment_from_request) | |
| 35 from .session import document_required, get_current | 36 from .session import document_required, get_current |
| 36 | 37 |
| 37 | 38 |
| 38 document = Blueprint('document', __name__) | 39 document = Blueprint('document', __name__) |
| 39 | 40 |
| 241 except IndexError: | 242 except IndexError: |
| 242 abort(404) | 243 abort(404) |
| 243 if request.method != 'POST': | 244 if request.method != 'POST': |
| 244 return render_template('document/edit_acknowledgment.j2', name=ack._name, organization=ack._organization, description=ack._description, url=ack._url, action='Update') | 245 return render_template('document/edit_acknowledgment.j2', name=ack._name, organization=ack._organization, description=ack._description, url=ack._url, action='Update') |
| 245 | 246 |
| 246 ack._name = request.form['name'] or None | 247 update_acknowledgment_from_request(ack) |
| 247 ack._organization = request.form['organization'] or None | |
| 248 ack._description = request.form['description'] or None | |
| 249 ack._url = request.form['url'] or None | |
| 250 return redirect(url_for('.view')) | 248 return redirect(url_for('.view')) |
| 251 | 249 |
| 252 @document.route('/acknowledgment/add', methods=['GET', 'POST']) | 250 @document.route('/acknowledgment/add', methods=['GET', 'POST']) |
| 253 @document_required | 251 @document_required |
| 254 def add_acknowledgment(): | 252 def add_acknowledgment(): |
| 255 if request.method != 'POST': | 253 if request.method != 'POST': |
| 256 return render_template('document/edit_acknowledgment.j2', action='Add') | 254 return render_template('document/edit_acknowledgment.j2', action='Add') |
| 257 | 255 |
| 258 ack = CVRFAcknowledgment() | 256 ack = create_acknowledgment_from_request() |
| 259 ack._name = request.form['name'] or None | |
| 260 ack._organization = request.form['organization'] or None | |
| 261 ack._description = request.form['description'] or None | |
| 262 ack._url = request.form['url'] or None | |
| 263 get_current().addAcknowledgment(ack) | 257 get_current().addAcknowledgment(ack) |
| 264 return redirect(url_for('.view')) | 258 return redirect(url_for('.view')) |