--- a/farol/document.py	Wed Oct 08 10:22:14 2014 +0200
+++ b/farol/document.py	Wed Oct 08 11:34:11 2014 +0200
@@ -31,6 +31,7 @@
     CVRFAggregateSeverity)
 from farolluz.renderer import utcnow
 
+from .controller import update_note_from_request, create_note_from_request
 from .session import document_required, get_current
 
 
@@ -179,11 +180,7 @@
     if request.method != 'POST':
         return render_template('document/edit_note.j2', note=note, types = note.TYPES)
 
-    note._type = request.form['type']
-    note._ordinal = int(request.form['ordinal'])
-    note._note = request.form['note']
-    note._title = request.form['title'] or None
-    note._audience = request.form['audience'] or None
+    update_note_from_request(note)
     return redirect(url_for('.view_note', ordinal=note._ordinal ))
 
 
@@ -197,12 +194,7 @@
             next_ordinal = notes[-1]._ordinal + 1
         return render_template('document/edit_note.j2', ordinal=next_ordinal, types=CVRFNote.TYPES, action='Add')
 
-    title = None
-    audience = None
-    title = request.form['title'] or None
-    audience = request.form['audience'] or None
-
-    note = CVRFNote(request.form['type'], int(request.form['ordinal']), request.form['note'], title, audience)
+    note = create_note_from_request()
     get_current().addNote(note)
     return redirect(url_for('.view'))