Added tags in API (view them and edit them)
This commit is contained in:
parent
da7c027f1c
commit
6810ba03d4
@ -43,6 +43,7 @@ from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \
|
|||||||
from mediagoblin.tools.files import delete_media_files
|
from mediagoblin.tools.files import delete_media_files
|
||||||
from mediagoblin.tools.common import import_component
|
from mediagoblin.tools.common import import_component
|
||||||
from mediagoblin.tools.routing import extract_url_arguments
|
from mediagoblin.tools.routing import extract_url_arguments
|
||||||
|
from mediagoblin.tools.text import convert_to_tag_list_of_dicts
|
||||||
|
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib.parse import urljoin
|
from six.moves.urllib.parse import urljoin
|
||||||
@ -770,7 +771,6 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
|
|||||||
"self": {
|
"self": {
|
||||||
"href": public_id,
|
"href": public_id,
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -786,6 +786,12 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
|
|||||||
if self.location:
|
if self.location:
|
||||||
context["location"] = self.get_location.serialize(request)
|
context["location"] = self.get_location.serialize(request)
|
||||||
|
|
||||||
|
# Always show tags, even if empty list
|
||||||
|
if self.tags:
|
||||||
|
context["tags"] = [tag['name'] for tag in self.tags]
|
||||||
|
else:
|
||||||
|
context["tags"] = []
|
||||||
|
|
||||||
if show_comments:
|
if show_comments:
|
||||||
comments = [
|
comments = [
|
||||||
l.comment().serialize(request) for l in self.get_comments()]
|
l.comment().serialize(request) for l in self.get_comments()]
|
||||||
@ -833,6 +839,9 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
|
|||||||
if "location" in data:
|
if "location" in data:
|
||||||
License.create(data["location"], self)
|
License.create(data["location"], self)
|
||||||
|
|
||||||
|
if "tags" in data:
|
||||||
|
self.tags = convert_to_tag_list_of_dicts(', '.join(data["tags"]))
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
class FileKeynames(Base):
|
class FileKeynames(Base):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user