X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fsubmit%2Fforms.py;h=69d211e61f957198714783a37ff2bd1c5980f695;hb=982fbde8e8bb6d0377e4e942a794e520774b6d72;hp=e9bd93fde6427de0c6f4d3dc37fbf3b9717adda5;hpb=d6251b29ecc76980010fd4048307ea8159b20cec;p=mediagoblin.git

diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index e9bd93fd..69d211e6 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -16,36 +16,53 @@
 
 
 import wtforms
-
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
+from mediagoblin import mg_globals
 from mediagoblin.tools.text import tag_length_validator
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
 
 
-class SubmitStartForm(wtforms.Form):
-    file = wtforms.FileField(_('File'))
-    title = wtforms.TextField(
-        _('Title'),
-        [wtforms.validators.Length(min=0, max=500)])
-    description = wtforms.TextAreaField(
-        _('Description of this work'),
-        description=_("""You can use
-                      <a href="http://daringfireball.net/projects/markdown/basics">
-                      Markdown</a> for formatting."""))
-    tags = wtforms.TextField(
-        _('Tags'),
-        [tag_length_validator],
-        description=_(
-          "Separate tags by commas."))
-    license = wtforms.SelectField(
-        _('License'),
-        [wtforms.validators.Optional(),],
-        choices=licenses_as_choices())
+def get_submit_start_form(form, **kwargs):
+    max_file_size = kwargs.get('max_file_size')
+    desc = None
+    if max_file_size:
+        desc = _('Max file size: {0} mb'.format(max_file_size))
+
+    class SubmitStartForm(wtforms.Form):
+        file = wtforms.FileField(
+            _('File'),
+            description=desc)
+        title = wtforms.StringField(
+            _('Title'),
+            [wtforms.validators.Length(min=0, max=500)])
+        description = wtforms.TextAreaField(
+            _('Description of this work'),
+            description=_("""You can use
+                        <a href="http://daringfireball.net/projects/markdown/basics">
+                        Markdown</a> for formatting."""))
+        tags = wtforms.StringField(
+            _('Tags'),
+            [tag_length_validator],
+            description=_(
+            "Separate tags by commas."))
+        license = wtforms.SelectField(
+            _('License'),
+            [wtforms.validators.Optional(),],
+            choices=licenses_as_choices())
+        collection = QuerySelectField(
+            _('Collection'),
+            allow_blank=True, blank_text=_('-- Select --'), get_label='title',)
+        max_file_size = wtforms.HiddenField('')
+        upload_limit = wtforms.HiddenField('')
+        uploaded = wtforms.HiddenField('')
+
+    return SubmitStartForm(form, **kwargs)
 
 class AddCollectionForm(wtforms.Form):
-    title = wtforms.TextField(
+    title = wtforms.StringField(
         _('Title'),
-        [wtforms.validators.Length(min=0, max=500), wtforms.validators.Required()])
+        [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired()])
     description = wtforms.TextAreaField(
         _('Description of this collection'),
         description=_("""You can use