Derniers projets

+ +

{% for p in projects %} @@ -118,6 +122,42 @@ {% endblock %} {% block js_page %} + {% endblock %} {% endblock %} {% analytics %} diff -r 79974d302930 -r 132e14ee5173 src/metadatacomposer/templates/metadatacomposer_modal_content_library.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_content_library.html Mon Jun 03 17:47:15 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_content_library.html Mon Jun 03 18:05:01 2013 +0200 @@ -4,7 +4,7 @@

diff -r 79974d302930 -r 132e14ee5173 src/metadatacomposer/templates/metadatacomposer_modal_image_library.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image_library.html Mon Jun 03 17:47:15 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image_library.html Mon Jun 03 18:05:01 2013 +0200 @@ -4,7 +4,7 @@

diff -r 79974d302930 -r 132e14ee5173 src/metadatacomposer/templates/partial/library_content_list.html --- a/src/metadatacomposer/templates/partial/library_content_list.html Mon Jun 03 17:47:15 2013 +0200 +++ b/src/metadatacomposer/templates/partial/library_content_list.html Mon Jun 03 18:05:01 2013 +0200 @@ -5,9 +5,10 @@

{% for res in content_results %}

- + data-description="{{ res.content.description|default_if_none:'' }}" > {% thumbnail res.content.image "140x140" crop="center" format="PNG" as im %}

{% empty %}

{% endthumbnail %}

@@ -16,7 +17,7 @@

{% trans "Previous" %}
{% trans "Previous" %}
{% trans "Previous" %}
{{i|add:'1'}}
{{i|add:'1'}}
{{i|add:'1'}}
{% trans "Next" %}
{% trans "Next" %}
{% trans "Next" %}
({% trans "All" %})
({% trans "All" %})

\ No newline at end of file diff -r 79974d302930 -r 132e14ee5173 src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Mon Jun 03 17:47:15 2013 +0200 +++ b/src/metadatacomposer/urls.py Mon Jun 03 18:05:01 2013 +0200 @@ -6,7 +6,8 @@ MetadataComposerRemoveImage, MetadataComposerRemoveContent,\ MetadataComposerRemoveProject, MetadataComposerImage,\ MetadataComposerModalContentLibrary, MetadataComposerPlayer,\ - MetadataComposerPreviewPlayer, MetadataComposerEdit + MetadataComposerPreviewPlayer, MetadataComposerEdit,\ + MetadataComposerNewProject urlpatterns = patterns('', url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'), @@ -26,6 +27,7 @@ url(r'^(?P.*)/player/(?P[\w-]+)/$', MetadataComposerPlayer.as_view(), name="composer_player"), url(r'^(?P.*)/previewplayer/(?P[\w-]+)/$', MetadataComposerPreviewPlayer.as_view(), name="composer_preview_player"), url(r'^(?P.*)/edit/(?P[\w-]+)/$', MetadataComposerEdit.as_view(), name="composer_edit"), + url(r'^(?P.*)/newproject/(?P[\w-]+)/$', MetadataComposerNewProject.as_view(), name="composer_new_project"), url(r'^(?P.*)/$', MetadataComposerHome.as_view(), name="composer_home"), url(r'^$', MetadataComposerHome.as_view(), name="composer_home"), ) diff -r 79974d302930 -r 132e14ee5173 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Mon Jun 03 17:47:15 2013 +0200 +++ b/src/metadatacomposer/views.py Mon Jun 03 18:05:01 2013 +0200 @@ -1,11 +1,13 @@ from django.conf import settings from django.contrib.auth.decorators import login_required +from django.contrib.auth.models import Group from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.http import HttpResponse, HttpResponseBadRequest 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 guardian.shortcuts import assign from ldt.ldt_utils.models import Project, Content from ldt.ldt_utils.views.content import write_content_base, delete_content from ldt.ldt_utils.utils import generate_uuid @@ -14,6 +16,7 @@ from metadatacomposer.models import Image from sorl.thumbnail import get_thumbnail import os +import datetime import logging #@UnresolvedImport @@ -159,15 +162,19 @@ page = request.GET.get("page") or 1 mode = request.GET.get("mode") or "resource" select_media = False + create_empty_project = False if mode=="library": self.template_name = "partial/library_content_list.html" select_media = True + elif mode=="create": + self.template_name = "partial/library_content_list.html" + create_empty_project = True # Get current contents page and theirs projects - content_results = get_contents_and_projects(page, request.user, select_media) + content_results = get_contents_and_projects(page, request.user, select_media, create_empty_project) context = self.get_context_dict(request) - context.update({"content_results":content_results}) + context.update({"content_results":content_results, "mode":mode}) return self.render_to_response(context) @@ -190,7 +197,7 @@ -def get_contents_and_projects(page, user, select_media=False): +def get_contents_and_projects(page, user, select_media=False, create_empty_project=False): # We get the current's page contents # prefetch_related("project_set") is unfortunately useless because we have to filter the project queryset later @@ -213,6 +220,8 @@ # We filter the content's projects with the user's ones if select_media: content.url = content.videopath.rstrip('/') + "/" + content.src + elif create_empty_project: + content.url = "create_project_for_me" projects = content.project_set.all().filter(owner=user) results_object_list.append({"content":content, "projects":projects}) @@ -259,6 +268,32 @@ +class MetadataComposerModalContentLibrary(TemplateResponseMixin, MetadataComposerContextView): + + def get_template_names(self): + return "metadatacomposer_modal_content_library.html" + + @method_decorator(login_required) + @method_decorator(never_cache) + def dispatch(self, *args, **kwargs): + return super(MetadataComposerModalContentLibrary, self).dispatch(*args, **kwargs) + + def get(self, request, branding="iri", **kwargs): + self.branding = branding + mode = request.GET.get("mode") or None + + select_media = True + create_empty_project = False + if mode=="create": + select_media = False + create_empty_project = True + + context = self.get_context_dict(request) + context.update({"content_results":get_contents_and_projects(1, request.user, select_media, create_empty_project), "mode":mode}) + return self.render_to_response(context) + + + class MetadataComposerModalImage(TemplateResponseMixin, MetadataComposerContextView): def get_template_names(self): @@ -321,25 +356,6 @@ -class MetadataComposerModalContentLibrary(TemplateResponseMixin, MetadataComposerContextView): - - def get_template_names(self): - return "metadatacomposer_modal_content_library.html" - - @method_decorator(login_required) - @method_decorator(never_cache) - def dispatch(self, *args, **kwargs): - return super(MetadataComposerModalContentLibrary, self).dispatch(*args, **kwargs) - - def get(self, request, branding="iri", **kwargs): - self.branding = branding - - context = self.get_context_dict(request) - context.update({"content_results":get_contents_and_projects(1, request.user, True)}) - return self.render_to_response(context) - - - class MetadataComposerRemoveImage(View): @method_decorator(login_required) @@ -514,3 +530,31 @@ +class MetadataComposerNewProject(View): + + @method_decorator(login_required) + def get(self, request, branding="iri", iri_id=None, **kwargs): + self.branding = branding + # Get content and creator user + content = get_object_or_404(Content.safe_objects, iri_id=iri_id) + contents = [ content, ] + u = request.user + # Create project + project = Project.create_project(title="Project on " + content.title + " " + datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), + user=u, contents=contents, + description='', + set_icon=False) + # Set project state to "published" and save + project.state = 2 + project.save() + assign('view_project', u, project) + assign('change_project', u, project) + # Since the project is published by default, we assign permission for the everyone group + everyone = Group.objects.get(name=settings.PUBLIC_GROUP_NAME) + assign('ldt_utils.view_project', everyone, project) + + # Redirect to project edition in composer interface + return redirect('composer_edit', branding=branding, ldt_id=project.ldt_id) + + +

Derniers projets

{{ res.content.title }}