Use extra pages for add_corpus and add_corpus_file forms.

app/corpora/forms.py

@@ -1,4 +1,5 @@
 from flask_wtf import FlaskForm
+from werkzeug.utils import secure_filename
 from wtforms import (FileField, StringField, SubmitField,
                      ValidationError, IntegerField, SelectField, TextAreaField)
 from wtforms.validators import DataRequired, Length

app/corpora/views.py

@@ -1,23 +1,22 @@
 from flask import (abort, current_app, flash, redirect, request,
-                   render_template, session, url_for, send_from_directory)
+                   render_template, url_for, send_from_directory)
 from flask_login import current_user, login_required
-from werkzeug import MultiDict
-from werkzeug.utils import secure_filename
 from . import corpora
 from .forms import (AddCorpusFileForm, AddCorpusForm, QueryDownloadForm,
                     QueryForm)
 from .. import db
 from ..models import Corpus, CorpusFile
+from werkzeug.utils import secure_filename
 import os
 import threading
 import logging
 
 
-@corpora.route('/add', methods=['POST'])
+@corpora.route('/add', methods=['GET', 'POST'])
 @login_required
 def add_corpus():
     add_corpus_form = AddCorpusForm()
-    if not add_corpus_form.validate_on_submit():
+    if add_corpus_form.validate_on_submit():
         corpus = Corpus(creator=current_user,
                         description=add_corpus_form.description.data,
                         title=add_corpus_form.title.data)
@@ -31,26 +30,21 @@ def add_corpus():
             flash('OSError!')
             db.session.remove(corpus)
             db.session.commit()
-        flash('Corpus created!')
+        flash('Corpus added!')
         return redirect(url_for('corpora.corpus', corpus_id=corpus.id))
+    return render_template('corpora/add_corpus.html.j2',
+                           add_corpus_form=add_corpus_form,
+                           title='Add corpus')
 
 
 @corpora.route('/<int:corpus_id>')
 @login_required
 def corpus(corpus_id):
-    add_corpus_file_form_data = session.pop('add_corpus_file_form_data',
-                                            default=None)
-    add_corpus_file_form = AddCorpusFileForm(
-        MultiDict(add_corpus_file_form_data)
-    )
-    if add_corpus_file_form_data is not None:
-        add_corpus_file_form.validate()
     corpus = Corpus.query.get_or_404(corpus_id)
     if not (corpus.creator == current_user or current_user.is_administrator()):
         abort(403)
-    return render_template('corpora/corpus.html.j2',
-                           add_corpus_file_form=add_corpus_file_form,
-                           corpus=corpus, title='Corpus')
+    return render_template('corpora/corpus.html.j2', corpus=corpus,
+                           title='Corpus')
 
 
 @corpora.route('/<int:corpus_id>/analysis', methods=['GET', 'POST'])
@@ -96,7 +90,7 @@ def delete_corpus(corpus_id):
     return redirect(url_for('main.dashboard'))
 
 
-@corpora.route('/<int:corpus_id>/files/add', methods=['POST'])
+@corpora.route('/<int:corpus_id>/files/add', methods=['GET', 'POST'])
 @login_required
 def add_corpus_file(corpus_id):
     corpus = Corpus.query.get_or_404(corpus_id)
@@ -113,19 +107,19 @@ def add_corpus_file(corpus_id):
         # Save the file
         dir = os.path.join(str(corpus.user_id), 'corpora', str(corpus.id))
         file.save(os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
-                                dir, filename))
-        author = add_corpus_file_form.author.data
-        publishing_year = add_corpus_file_form.publishing_year.data
-        title = add_corpus_file_form.title.data
-        corpus_file = CorpusFile(author=author, corpus=corpus, dir=dir,
-                                 filename=filename,
-                                 publishing_year=publishing_year, title=title)
+                               dir, filename))
+
+        corpus_file = CorpusFile(author=add_corpus_file_form.author.data,
+                                 corpus=corpus, dir=dir, filename=filename,
+                                 publishing_year=add_corpus_file_form.publishing_year.data,
+                                 title=add_corpus_file_form.title.data)
         db.session.add(corpus_file)
         db.session.commit()
         flash('Corpus file added!')
-    else:
-        session['add_corpus_file_form_data'] = request.form
-    return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
+        return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
+    return render_template('corpora/add_corpus_file.html.j2',
+                           add_corpus_file_form=add_corpus_file_form,
+                           corpus=corpus, title='Add corpus file')
 
 
 @corpora.route('/<int:corpus_id>/files/<int:corpus_file_id>/delete')