Liste des vidéos
diff -r cedadc7d039a -r 3725e93a2987 src/metadatacomposer/templates/partial/resource_content_list.html
--- a/src/metadatacomposer/templates/partial/resource_content_list.html Tue May 28 17:42:15 2013 +0200
+++ b/src/metadatacomposer/templates/partial/resource_content_list.html Tue May 28 18:51:57 2013 +0200
@@ -14,7 +14,7 @@
{% for res in content_results %}
-
+
{% thumbnail res.content.image "60x60" crop="center" format="PNG" as im %} {% empty %} {% endthumbnail %} |
{{ res.content.title }} |
@@ -26,10 +26,8 @@
|
{{ res.content.update_date|date:"Y/m/d" }} |
-
-
-
-
+
+
|
{% endfor %}
diff -r cedadc7d039a -r 3725e93a2987 src/metadatacomposer/templates/partial/resource_image_list.html
--- a/src/metadatacomposer/templates/partial/resource_image_list.html Tue May 28 17:42:15 2013 +0200
+++ b/src/metadatacomposer/templates/partial/resource_image_list.html Tue May 28 18:51:57 2013 +0200
@@ -14,7 +14,7 @@
{% for res in image_results %}
-
+
| {% thumbnail res.image_file "60x60" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} |
{{ res.title }} |
@@ -25,7 +25,7 @@
| {{ res.modification_date|date:"Y/m/d" }} |
-
+
|
diff -r cedadc7d039a -r 3725e93a2987 src/metadatacomposer/urls.py
--- a/src/metadatacomposer/urls.py Tue May 28 17:42:15 2013 +0200
+++ b/src/metadatacomposer/urls.py Tue May 28 18:51:57 2013 +0200
@@ -1,8 +1,10 @@
from django.conf.urls.defaults import patterns, url
from metadatacomposer.views import MetadataComposerHome, MetadataComposerProjectList,\
MetadataComposerResourceList, MetadataComposerContentPagination,\
- MetadataComposerModalVideo, MetadataComposerModalImage,\
- MetadataComposerImagePagination, MetadataComposerModalImageLibrary
+ MetadataComposerModalContent, MetadataComposerModalImage,\
+ MetadataComposerImagePagination, MetadataComposerModalImageLibrary,\
+ MetadataComposerRemoveImage, MetadataComposerRemoveContent,\
+ MetadataComposerRemoveProject
urlpatterns = patterns('',
url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'),
@@ -10,10 +12,13 @@
url(r'^(?P.*)/resourcelist/$', MetadataComposerResourceList.as_view(), name="composer_resource_list"),
url(r'^(?P.*)/imagepage/$', MetadataComposerImagePagination.as_view(), name="composer_image_page"),
url(r'^(?P.*)/contentpage/$', MetadataComposerContentPagination.as_view(), name="composer_content_page"),
- url(r'^(?P.*)/modalvideo/(?P[\w-]+)$', MetadataComposerModalVideo.as_view(), name="composer_modal_video"),
- url(r'^(?P.*)/modalvideo/$', MetadataComposerModalVideo.as_view(), name="composer_modal_video"),
+ url(r'^(?P.*)/modalcontent/(?P[\w-]+)$', MetadataComposerModalContent.as_view(), name="composer_modal_content"),
+ url(r'^(?P.*)/modalcontent/$', MetadataComposerModalContent.as_view(), name="composer_modal_content"),
url(r'^(?P.*)/modalimage/$', MetadataComposerModalImage.as_view(), name="composer_modal_image"),
url(r'^(?P.*)/modalimagelibrary/$', MetadataComposerModalImageLibrary.as_view(), name="composer_modal_image_library"),
+ url(r'^(?P.*)/removecontent/$', MetadataComposerRemoveContent.as_view(), name="composer_remove_content"),
+ url(r'^(?P.*)/removeimage/$', MetadataComposerRemoveImage.as_view(), name="composer_remove_image"),
+ url(r'^(?P.*)/removeproject/$', MetadataComposerRemoveProject.as_view(), name="composer_remove_project"),
url(r'^(?P.*)/$', MetadataComposerHome.as_view(), name="composer_home"),
url(r'^$', MetadataComposerHome.as_view(), name="composer_home"),
)
diff -r cedadc7d039a -r 3725e93a2987 src/metadatacomposer/views.py
--- a/src/metadatacomposer/views.py Tue May 28 17:42:15 2013 +0200
+++ b/src/metadatacomposer/views.py Tue May 28 18:51:57 2013 +0200
@@ -1,13 +1,14 @@
from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
from django.utils.decorators import method_decorator
from django.views.decorators.cache import never_cache
from django.views.generic.base import View, TemplateResponseMixin
from ldt.ldt_utils.models import Project, Content
-from ldt.ldt_utils.views.content import write_content_base
+from ldt.ldt_utils.views.content import write_content_base, delete_content
from ldt.ldt_utils.utils import generate_uuid
+from ldt.security.permissionchecker import check_object_perm_for_user
from metadatacomposer.forms import ImageUploadModelForm
from metadatacomposer.models import Image
@@ -202,15 +203,15 @@
-class MetadataComposerModalVideo(TemplateResponseMixin, MetadataComposerContextView):
+class MetadataComposerModalContent(TemplateResponseMixin, MetadataComposerContextView):
def get_template_names(self):
- return "metadatacomposer_modal_video.html"
+ return "metadatacomposer_modal_content.html"
@method_decorator(login_required)
@method_decorator(never_cache)
def dispatch(self, *args, **kwargs):
- return super(MetadataComposerModalVideo, self).dispatch(*args, **kwargs)
+ return super(MetadataComposerModalContent, self).dispatch(*args, **kwargs)
def get(self, request, branding="iri", iri_id=None, **kwargs):
self.branding = branding
@@ -302,3 +303,46 @@
+class MetadataComposerRemoveImage(View):
+
+ def get_template_names(self):
+ return "metadatacomposer_modal_image_library.html"
+
+ @method_decorator(login_required)
+ def get(self, request, branding="iri", **kwargs):
+ self.branding = branding
+ image_pk = request.GET.get("image") or None
+ if image_pk:
+ image = get_object_or_404(Image, pk=image_pk)
+ image.delete()
+
+ return redirect(request.META['HTTP_REFERER'])
+
+
+
+class MetadataComposerRemoveContent(View):
+
+ @method_decorator(login_required)
+ def get(self, request, branding="iri", **kwargs):
+ self.branding = branding
+ delete_content(request)
+
+ return redirect(request.META['HTTP_REFERER'])
+
+
+
+class MetadataComposerRemoveProject(View):
+
+ @method_decorator(login_required)
+ def get(self, request, branding="iri", **kwargs):
+ self.branding = branding
+ ldt_id = request.GET.get("ldt_id") or None
+ if ldt_id:
+ proj = get_object_or_404(Project, ldt_id=ldt_id)
+ if check_object_perm_for_user(proj, "change_project", request.user):
+ proj.delete()
+
+ return redirect(request.META['HTTP_REFERER'])
+
+
+