Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest

2013-01-22 13:43:02 -06:00
parent 55a04f01b8 dc4dfbde35
commit 79f7cfd900
6 changed files with 62 additions and 36 deletions
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -40,7 +40,8 @@ def submit_start(request):
    """
    First view for submitting a file.
    """
-    submit_form = submit_forms.SubmitStartForm(request.form)
+    submit_form = submit_forms.SubmitStartForm(request.form,
+        license=request.user.get('license_preference'))

    if request.method == 'POST' and submit_form.validate():
        if not ('file' in request.files