heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On image submission, do not require title. If none entered, default to filename.

Browse Source
This commit is contained in:
Aaron Williamson 2011-05-09 00:06:38 -04:00 committed by Christopher Allan Webber
parent 9a22d0a023
commit bb49e56f8c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/models.py
View File

@ -89,7 +89,7 @@ class MediaEntry(Document):
'thumbnail_file': [unicode]} 'thumbnail_file': [unicode]}
required_fields = [ required_fields = [
'uploader', 'title', 'created', 'media_type'] 'uploader', 'created', 'media_type']
default_values = { default_values = {
'created': datetime.datetime.utcnow, 'created': datetime.datetime.utcnow,

2
mediagoblin/submit/forms.py
View File

@ -21,6 +21,6 @@ import wtforms
class SubmitStartForm(wtforms.Form): class SubmitStartForm(wtforms.Form):
title = wtforms.TextField( title = wtforms.TextField(
'Title', 'Title',
[wtforms.validators.Length(min=1, max=500)]) [wtforms.validators.Length(min=-1, max=500)])
description = wtforms.TextAreaField('Description of this work') description = wtforms.TextAreaField('Description of this work')
file = wtforms.FileField('File') file = wtforms.FileField('File')

8
mediagoblin/submit/views.py
View File

@ -14,7 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from os.path import splitext
from cgi import FieldStorage from cgi import FieldStorage
from webob import Response, exc from webob import Response, exc
@ -39,9 +39,11 @@ def submit_start(request):
submit_form.file.errors.append( submit_form.file.errors.append(
u'You must provide a file.') u'You must provide a file.')
else: else:
filename = request.POST['file'].filename
# create entry and save in database # create entry and save in database
entry = request.db.MediaEntry() entry = request.db.MediaEntry()
entry['title'] = request.POST['title'] entry['title'] = request.POST['title'] or unicode(splitext(filename)[0])
entry['description'] = request.POST.get('description') entry['description'] = request.POST.get('description')
entry['media_type'] = u'image' # heh entry['media_type'] = u'image' # heh
entry['uploader'] = request.user entry['uploader'] = request.user
@ -54,7 +56,7 @@ def submit_start(request):
queue_filepath = request.app.queue_store.get_unique_filepath( queue_filepath = request.app.queue_store.get_unique_filepath(
['media_entries', ['media_entries',
unicode(entry['_id']), unicode(entry['_id']),
secure_filename(request.POST['file'].filename)]) secure_filename(filename)])
# queue appropriately # queue appropriately
queue_file = request.app.queue_store.get_file( queue_file = request.app.queue_store.get_file(