heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Made some changes so that the metadata editing page works well with the updated

Browse Source 
metadata tools.
This commit is contained in:
tilly-Q
2014-05-12 13:07:11 -04:00
parent 7bcb3e100c
commit 6b6b1b076b
4 changed files with 10 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/edit/forms.py
View File

@@ -131,6 +131,3 @@ class EditMetaDataForm(wtforms.Form):
media_metadata = wtforms.FieldList(
wtforms.FormField(MetaDataForm, label="")
)
context = wtforms.FieldList(
wtforms.FormField(MetaDataForm, label="")
)

27
mediagoblin/edit/views.py
View File

@@ -33,6 +33,7 @@ from mediagoblin.decorators import (require_active_login, active_user_from_url,
get_user_collection, user_has_privilege,
user_not_banned)
from mediagoblin.tools.crypto import get_timed_signer_url
from mediagoblin.tools.metadata import compact_and_validate
from mediagoblin.tools.mail import email_debug_message
from mediagoblin.tools.response import (render_to_response,
redirect, redirect_obj, render_404)
@@ -441,32 +442,19 @@ def change_email(request):
def edit_metadata(request, media):
form = forms.EditMetaDataForm(request.form)
if request.method == "POST" and form.validate():
context = dict([(row['identifier'],row['value'])
for row in form.context.data])
metadata_dict = dict([(row['identifier'],row['value'])
for row in form.media_metadata.data])
# TODO VALIDATE THIS BEFORE WE ENTER IT
# validate(metadata_dict)
# validate(context)
json_ld_metadata = jsonld.compact(metadata_dict, context)
# media.media_metadata = json_ld_metadata
# media.save()
json_ld_metadata = compact_and_validate(metadata_dict)
media.media_metadata = json_ld_metadata
media.save()
return redirect_obj(request, media)
if media.media_metadata:
for row in media.media_metadata.iteritems():
if row[0] == "@context": continue
identifier = row[0]
# TODO Will change when we revert the metadata branch
value = row[1]['@value']
for identifier, value in media.media_metadata.iteritems():
if identifier == "@context": continue
form.media_metadata.append_entry({
'identifier':identifier,
'value':value})
for row in media.media_metadata['@context'].iteritems():
identifier, value = row[0:2]
form.context.append_entry({
'identifier':identifier,
'value':value})
else:
form.media_metadata.append_entry({
'identifier':"",
@@ -474,9 +462,6 @@ def edit_metadata(request, media):
form.media_metadata.append_entry({
'identifier':"",
'value':""})
form.context.append_entry({
'identifier':"",
'value':""})
return render_to_response(
request,
'mediagoblin/edit/metadata.html',