{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}
@@ -96,9 +72,9 @@
{% include "ldt/ldt_utils/partial/permissions.html" %}
{% include "ldt/ldt_utils/partial/picture.html"%}
-
+
-
+
{% if group_id %}
{% if is_owner_group %}
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Nov 05 15:19:24 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Nov 05 15:20:11 2012 +0100
@@ -19,7 +19,6 @@
function init_events(base_node) {
init_events_projects(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", project_filter_url, publish_project_url, unpublish_project_url)
- init_events_groups(base_node, "{% url ldt.ldt_utils.views.workspace.popup_embed %}", groups_filter_url);
}
var global_csrf_token = "{{ csrf_token }}";
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Mon Nov 05 15:19:24 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Mon Nov 05 15:20:11 2012 +0100
@@ -121,8 +121,10 @@
+ {% if media_form %}
+ {% endif %}
{{ content_form.is_public }}
+ {% endif %}
{% trans "User and group list" %}
+ {% endif %}
@@ -147,7 +149,9 @@
+ {% if media_form %}
+ {% endif %}
{% trans "Members list" %}
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/ldt_utils/tests.py
--- a/src/ldt/ldt/ldt_utils/tests.py Mon Nov 05 15:19:24 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from django.conf import settings
-from django.test import TestCase
-from ldt.ldt_utils.models import User
-from models import Project, Content
-from utils import LdtUtils, LdtAnnotation, create_ldt, create_empty_iri, copy_ldt
-import lxml.etree
-import tempfile
-import unittest
-import uuid
-
-class SimpleTest(TestCase):
- def test_basic_addition(self):
- """
- Tests that 1 + 1 always equals 2.
- """
- self.failUnlessEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-
-class UtilsTest(unittest.TestCase):
- def setUp(self):
- self.user = User()
- self.user.username = "toto"
- self.LU = LdtUtils()
-
- self.project = Project(title="titleproj1", owner=self.user)
- self.project.ldt = ' CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 CA: prof et admin conseil de classe Reprise de la figure precedente TC: prof et admin Conseil de classe Argumentation conseil de classe Reprise de la figure precedente Bout a bout 1 .*)/(?P.*)$', 'views.lignesdetemps.search_init'),
url(r'^searchForm/$', 'views.workspace.search_form'),
url(r'^published/$', 'views.workspace.published_project'),
- url(r'^groups/$', 'views.workspace.groups'),
+ url(r'^groups/$', 'views.workspace.groups', name="groups-view"),
url(r'^get_group_projects/$', 'views.group.get_group_projects'),
url(r'^search/$', 'views.workspace.search_index'),
url(r'^search/(?P.*)/(?P.*)$', 'views.lignesdetemps.search_index_get'),
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py Mon Nov 05 15:19:24 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/content.py Mon Nov 05 15:20:11 2012 +0100
@@ -5,6 +5,7 @@
from django.forms.models import model_to_dict
from django.core.files import File
from django.db import transaction
+#from django.core.files.temp import NamedTemporaryFile
from django.forms.util import ErrorList
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response, redirect
@@ -20,13 +21,14 @@
import ldt.utils.path as ldt_utils_path
import logging
import mimetypes
-import os
+import os, stat
import urllib2
import subprocess
import re
import datetime
import math
import requests
+import django.utils.simplejson as simplejson
import urlparse
import tempfile
@@ -45,159 +47,160 @@
current_front_project = instance_content.front_project
form_status = 'none'
errors_transaction = []
+ transaction_succeed = True
- # catch error from creating content, project, media
- try:
- if request.method == "POST":
-
- if instance_content is not None:
- content_instance_val = model_to_dict(instance_content, exclude=ContentForm.Meta.exclude)
- else:
- content_instance_val = {}
-
- if instance_media is not None:
- media_instance_val = model_to_dict(instance_media, exclude=MediaForm.Meta.exclude)
- else:
- media_instance_val = {}
- #add prefix
-
- def add_prefix(_dict, prefix):
- return dict([('%s-%s' % (prefix, key), value) for key,value in _dict.items()])
-
- content_instance_val = add_prefix(content_instance_val, "content")
- media_instance_val= add_prefix(media_instance_val, "media")
-
- for k in request.POST.keys():
- value = request.POST.get(k)
- content_instance_val[k] = value
- media_instance_val[k] = value
-
- content_instance_val['read_list'] = request.POST.getlist('read_list')
- content_instance_val['write_list'] = request.POST.getlist('write_list')
- content_instance_val['share'] = request.POST.get('share', True)
-
- content_form = ContentForm(content_instance_val, prefix="content", instance=instance_content)
- media_form = MediaForm(media_instance_val, request.FILES, prefix="media", instance=instance_media)
- picture_form = PictureForm(None, request.POST, request.FILES)
-
- if request.user.is_staff:
- content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
-
-
- media_valid = media_form.is_valid()
- content_valid = content_form.is_valid()
- picture_valid = picture_form.is_valid()
- if 'image' in request.POST.keys():
- image_link = request.POST.get('url_image')
- if picture_valid and image_link!='' :
- try :
- r = requests.get(image_link)
- img_temp = tempfile.NamedTemporaryFile(suffix='.png')
- if img_temp:
- img_temp.write(r.content)
- img_temp.flush()
- picture_form.cleaned_data["image"]=File(img_temp)
- except Exception as inst:
- logging.debug("couldn't download video thumbnail from image_link : "+str(image_link))
- logging.debug("write_content_base : valid form: for instance : " + repr(instance_media) + " -> media " + str(media_valid) + " content : for instance : " + repr(instance_content) + " : " + str(content_valid) + "picture : valid :" +str(picture_valid)+" loulou") #@UndefinedVariable
-
- if media_valid and content_valid and picture_valid:
-
- # see if media must be created
- cleaned_data = {}
- cleaned_data.update(media_form.cleaned_data)
- cleaned_data.pop("media_public")
-
- media_input_type = content_form.cleaned_data["media_input_type"]
+ if request.method == "POST":
+
+ if instance_content is not None:
+ content_instance_val = model_to_dict(instance_content, exclude=ContentForm.Meta.exclude)
+ else:
+ content_instance_val = {}
+
+ if instance_media is not None:
+ media_instance_val = model_to_dict(instance_media, exclude=MediaForm.Meta.exclude)
+ else:
+ media_instance_val = {}
+ #add prefix
+
+ def add_prefix(_dict, prefix):
+ return dict([('%s-%s' % (prefix, key), value) for key,value in _dict.items()])
+
+ content_instance_val = add_prefix(content_instance_val, "content")
+ media_instance_val= add_prefix(media_instance_val, "media")
- if media_input_type == "none":
- media = None
- elif media_input_type == "link":
- media = content_form.cleaned_data["media_obj"]
- created = False
- elif media_input_type == "create":
- del cleaned_data["media_file"]
- if not cleaned_data['videopath']:
- cleaned_data['videopath'] = settings.STREAM_URL
- # if the source is already http:// or rtmp:// we don't have to add STREAM_URL
- if cleaned_data['src'].startswith("rtmp://") or cleaned_data['src'].startswith("http://"):
- cleaned_data['videopath'] = ''
+ for k in request.POST.keys():
+ value = request.POST.get(k)
+ content_instance_val[k] = value
+ media_instance_val[k] = value
+
+ content_instance_val['read_list'] = request.POST.getlist('read_list')
+ content_instance_val['write_list'] = request.POST.getlist('write_list')
+ content_instance_val['share'] = request.POST.get('share', True)
+
+ content_form = ContentForm(content_instance_val, prefix="content", instance=instance_content)
+ media_form = MediaForm(media_instance_val, request.FILES, prefix="media", instance=instance_media)
+ picture_form = PictureForm(None, request.POST, request.FILES)
+
+ if request.user.is_staff:
+ content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
+
+ media_valid = media_form.is_valid()
+ content_valid = content_form.is_valid()
+ picture_valid = picture_form.is_valid()
+ if 'image' in request.POST.keys():
+ image_link = request.POST.get('url_image')
+ if picture_valid and image_link!='' :
+ try :
+ r = requests.get(image_link)
+ img_temp = tempfile.NamedTemporaryFile(suffix='.png')
+ if img_temp:
+ img_temp.write(r.content)
+ img_temp.flush()
+ picture_form.cleaned_data["image"]=File(img_temp)
+ except Exception as inst:
+ logging.debug("couldn't download video thumbnail from image_link : "+str(image_link))
+ logging.debug("write_content_base : valid form: for instance : " + repr(instance_media) + " -> media " + str(media_valid) + " content : for instance : " + repr(instance_content) + " : " + str(content_valid) + "picture : valid :" +str(picture_valid)) #@UndefinedVariable
+
+ if media_valid and content_valid and picture_valid:
+
+ # see if media must be created
+ cleaned_data = {}
+ cleaned_data.update(media_form.cleaned_data)
+ cleaned_data.pop("media_public")
+
+ media_input_type = content_form.cleaned_data["media_input_type"]
+
+ if media_input_type == "none":
+ media = None
+ elif media_input_type == "link":
+ media = content_form.cleaned_data["media_obj"]
+ created = False
+ elif media_input_type == "create":
+ del cleaned_data["media_file"]
+ if not cleaned_data['videopath']:
+ cleaned_data['videopath'] = settings.STREAM_URL
+ # if the source is already http:// or rtmp:// we don't have to add STREAM_URL
+ if cleaned_data['src'].startswith("rtmp://") or cleaned_data['src'].startswith("http://"):
+ cleaned_data['videopath'] = ''
+ try:
media, created = Media.objects.get_or_create(src=cleaned_data['src'], defaults=cleaned_data) #@UndefinedVariable
- elif media_input_type == "url" or media_input_type == "upload" :
- # copy file
- #complet src
- destination_file = None
- source_file = None
- try:
- if media_input_type == "url":
- url = cleaned_data["external_src_url"]
- source_file = urllib2.urlopen(url)
- source_filename = source_file.info().get('Content-Disposition', None)
- if not source_filename:
- source_filename = urlparse.urlparse(url).path.rstrip("/").split('/')[-1]
- elif media_input_type == "upload":
- #source_file = request.FILES['media-media_file']
- # At this point the file has already be uploaded thanks to the upload view, and original file name is sent through a post var
- source_filename = request.POST["media-local_file_name"]
-
- source_filename = ldt_utils_path.sanitize_filename(source_filename)
- destination_filepath = os.path.join(settings.STREAM_PATH, source_filename)
- base_source_filename = source_filename
- extension = base_source_filename.split(".")[-1]
- if extension == base_source_filename:
- extension = ""
- base_basename_filename = base_source_filename
- else:
- base_basename_filename = base_source_filename[:-1 * (len(extension) + 1)]
- i = 0
+ except:
+ transaction_succeed = False
+ elif media_input_type == "url" or media_input_type == "upload" :
+ # copy file
+ #complet src
+ destination_file = None
+ source_file = None
+ try:
+ if media_input_type == "url":
+ url = cleaned_data["external_src_url"]
+ source_file = urllib2.urlopen(url)
+ source_filename = source_file.info().get('Content-Disposition', None)
+ if not source_filename:
+ source_filename = urlparse.urlparse(url).path.rstrip("/").split('/')[-1]
+ elif media_input_type == "upload":
+ #source_file = request.FILES['media-media_file']
+ # At this point the file has already be uploaded thanks to the upload view, and original file name is sent through a post var
+ source_filename = request.POST["media-local_file_name"]
+
+ source_filename = ldt_utils_path.sanitize_filename(source_filename)
+ destination_filepath = os.path.join(settings.STREAM_PATH, source_filename)
+ base_source_filename = source_filename
+ extension = base_source_filename.split(".")[-1]
+ if extension == base_source_filename:
+ extension = ""
+ base_basename_filename = base_source_filename
+ else:
+ base_basename_filename = base_source_filename[:-1 * (len(extension) + 1)]
+ i = 0
+
+ while os.path.exists(destination_filepath):
+ base_source_filename = "%s.%d.%s" % (base_basename_filename, i, extension)
+ destination_filepath = os.path.join(settings.STREAM_PATH, base_source_filename)
+ i += 1
+
+ if media_input_type == "url":
+ # we upload the file if we are in url case
+ destination_file = open(destination_filepath, "wb")
+ chunck = source_file.read(2048)
+ while chunck:
+ destination_file.write(chunck)
+ chunck = source_file.read(2048)
- while os.path.exists(destination_filepath):
- base_source_filename = "%s.%d.%s" % (base_basename_filename, i, extension)
- destination_filepath = os.path.join(settings.STREAM_PATH, base_source_filename)
- i += 1
-
- if media_input_type == "url":
- # we upload the file if we are in url case
- destination_file = open(destination_filepath, "wb")
- chunck = source_file.read(2048)
- while chunck:
- destination_file.write(chunck)
- chunck = source_file.read(2048)
-
- elif media_input_type == "upload":
- # The media file has been uploaded in the session temp folder
- # so we just have to move to the regular folder and rename it.
- if os.path.exists(os.path.join(settings.STREAM_PATH, "tmp/" + request.COOKIES[settings.SESSION_COOKIE_NAME] + "/", source_filename)):
- os.rename(os.path.join(settings.STREAM_PATH, "tmp/" + request.COOKIES[settings.SESSION_COOKIE_NAME] + "/", source_filename), os.path.join(settings.STREAM_PATH, base_source_filename))
-
-
- src_prefix = settings.STREAM_SRC_PREFIX.rstrip("/")
- if len(src_prefix) > 0:
- cleaned_data["src"] = src_prefix + "/" + base_source_filename
- else:
- cleaned_data["src"] = base_source_filename
-
-
- except Exception as inst:
- logging.debug("write_content_base : POST error when processing file:" + str(inst)) #@UndefinedVariable
- form_status = "error"
- #set error for form
- if media_input_type == "url":
- errors = media_form._errors.setdefault("external_src_url", ErrorList())
- errors.append(_("Problem when downloading file from url : ") + url)
- elif media_input_type == "upload":
- errors = media_form._errors.setdefault("media_file", ErrorList())
- errors.append(_("Problem when uploading file : ") + str(inst))
- finally:
- if media_input_type == "url":
- if destination_file:
- destination_file.close()
- if source_file:
- source_file.close()
+ elif media_input_type == "upload":
+ # The media file has been uploaded in the session temp folder
+ # so we just have to move to the regular folder and rename it.
+ if os.path.exists(os.path.join(settings.STREAM_PATH, "tmp/" + request.COOKIES[settings.SESSION_COOKIE_NAME] + "/", source_filename)):
+ os.rename(os.path.join(settings.STREAM_PATH, "tmp/" + request.COOKIES[settings.SESSION_COOKIE_NAME] + "/", source_filename), os.path.join(settings.STREAM_PATH, base_source_filename))
- if form_status != "error":
- #try:
+ src_prefix = settings.STREAM_SRC_PREFIX.rstrip("/")
+ if len(src_prefix) > 0:
+ cleaned_data["src"] = src_prefix + "/" + base_source_filename
+ else:
+ cleaned_data["src"] = base_source_filename
+
+
+ except Exception as inst:
+ logging.debug("write_content_base : POST error when processing file:" + str(inst)) #@UndefinedVariable
+ form_status = "error"
+ #set error for form
+ if media_input_type == "url":
+ errors = media_form._errors.setdefault("external_src_url", ErrorList())
+ errors.append(_("Problem when downloading file from url : ") + url)
+ elif media_input_type == "upload":
+ errors = media_form._errors.setdefault("media_file", ErrorList())
+ errors.append(_("Problem when uploading file : ") + str(inst))
+ finally:
+ if media_input_type == "url":
+ if destination_file:
+ destination_file.close()
+ if source_file:
+ source_file.close()
+
+
+ if form_status != "error":
+ try:
del cleaned_data["media_file"]
if not cleaned_data['videopath']:
cleaned_data['videopath'] = settings.STREAM_URL
@@ -207,59 +210,65 @@
cleaned_data['mimetype_field'] = mimetype
media, created = Media.safe_objects.get_or_create(src=cleaned_data['src'], defaults=cleaned_data) #@UndefinedVariable
cached_assign('view_media', request.user, media)
- else:
- media = None
-
-
- if media and not created:
- for attribute in ('external_id', 'external_permalink', 'external_publication_url', 'external_src_url', 'media_creation_date', 'videopath', 'duration', 'description', 'title', 'front_project'):
- setattr(media, attribute, cleaned_data.get(attribute))
- mimetype = cleaned_data.get('mimetype_field', None)
- if not mimetype:
- mimetype = mimetypes.guess_type(media.src)
- media.mimetype_field = mimetype
- cached_assign('view_media', request.user, media)
- cached_assign('change_media', request.user, media)
- media.save()
+ except:
+ transaction_succeed = False
+ else:
+ media = None
+
+
+ if media and not created:
+ for attribute in ('external_id', 'external_permalink', 'external_publication_url', 'external_src_url', 'media_creation_date', 'videopath', 'duration', 'description', 'title', 'front_project'):
+ setattr(media, attribute, cleaned_data.get(attribute))
+ mimetype = cleaned_data.get('mimetype_field', None)
+ if not mimetype:
+ mimetype = mimetypes.guess_type(media.src)
+ media.mimetype_field = mimetype
+ cached_assign('view_media', request.user, media)
+ cached_assign('change_media', request.user, media)
+ media.save()
+
+ if form_status != "error":
+ content_defaults = {}
+ content_defaults.update(content_form.cleaned_data)
+ content_defaults['media_obj'] = media
+
+ for key in ["media_input_type", "groups", "is_public", "read_list", "write_list", "share" ]:
+ del content_defaults[key]
- if form_status != "error":
- content_defaults = {}
- content_defaults.update(content_form.cleaned_data)
- content_defaults['media_obj'] = media
-
- for key in ["media_input_type", "groups", "is_public", "read_list", "write_list", "share" ]:
- del content_defaults[key]
-
+ try:
content, created = Content.safe_objects.get_or_create(iri_id=content_form.cleaned_data['iri_id'], defaults=content_defaults) #@UndefinedVariable
+ except:
+ transaction_succeed = False
- if not created and not request.user.has_perm('ldt_utils.change_content', content):
- raise AttributeError("%s is not allowed to change content %s" % (request.user, content))
-
- cached_assign('change_content', request.user, content)
- cached_assign('view_content', request.user, content)
- everyone = Group.objects.get(name=settings.PUBLIC_GROUP_NAME)
-
- if media_form.cleaned_data['media_public']:
+ if not created and not request.user.has_perm('ldt_utils.change_content', content):
+ raise AttributeError("%s is not allowed to change content %s" % (request.user, content))
+
+ cached_assign('change_content', request.user, content)
+ cached_assign('view_content', request.user, content)
+ everyone = Group.objects.get(name=settings.PUBLIC_GROUP_NAME)
+
+ if media_form.cleaned_data['media_public']:
+ cached_assign('view_content', everyone, content)
+ if media:
+ cached_assign('view_media', everyone, media)
+ else:
+ remove_perm('ldt_utils.view_media', everyone, media)
+ assign_perm_to_obj(content, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
+ if media:
+ assign_perm_to_obj(media, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
+ if content_form.cleaned_data['is_public']:
cached_assign('view_content', everyone, content)
- if media:
- cached_assign('view_media', everyone, media)
else:
- remove_perm('ldt_utils.view_media', everyone, media)
- if media:
- assign_perm_to_obj(media, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
- assign_perm_to_obj(content, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
- if content_form.cleaned_data['is_public']:
- cached_assign('view_content', everyone, content)
- else:
- remove_perm('ldt_utils.view_content', everyone, content)
-
- if not created:
- for attribute in ('iriurl', 'title', 'description', 'duration', 'content_creation_date', 'tags', 'media_obj'):
- setattr(content, attribute, content_defaults[attribute])
-
- if request.user.is_staff and content_defaults.has_key('front_project'):
- content.front_project = content_defaults['front_project']
+ remove_perm('ldt_utils.view_content', everyone, content)
+
+ if not created:
+ for attribute in ('iriurl', 'title', 'description', 'duration', 'content_creation_date', 'tags', 'media_obj'):
+ setattr(content, attribute, content_defaults[attribute])
+ if request.user.is_staff and content_defaults.has_key('front_project'):
+ content.front_project = content_defaults['front_project']
+
+ try:
content.save()
picture_form.model = content
picture_form.save()
@@ -267,34 +276,33 @@
media_form = MediaForm(instance=media, prefix="media")
content_form = ContentForm(instance=content, prefix="content")
picture_form = PictureForm()
- else:
- form_status = 'error'
+ except:
+ transaction_succeed = False
+ else:
+ form_status = 'error'
+ else:
+ form_status = 'empty'
+ initial_c = { 'media_input_type':"link"}
+ initial_m = {}
+ if instance_media:
+ initial_m['media_public'] = instance_media.is_public
else:
- form_status = 'empty'
- initial_c = { 'media_input_type':"link"}
- initial_m = {}
- if instance_media:
- initial_m['media_public'] = instance_media.is_public
- else:
- initial_m['media_public'] = True
- if instance_content:
- initial_c['is_public'] = instance_content.is_public
- else:
- initial_c['is_public'] = True
- content_form = ContentForm(prefix="content", instance=instance_content, initial=initial_c)
- media_form = MediaForm(prefix="media", instance=instance_media, initial=initial_m)
- picture_form = PictureForm()
-
- if instance_content is not None:
- content_form.media_input_type = "link"
-
- if request.user.is_staff:
- content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
- except:
- transaction.rollback()
- errors_transaction.append(_("Content creation failure"))
- return False, False, False, False, False, errors_transaction
- else:
+ initial_m['media_public'] = True
+ if instance_content:
+ initial_c['is_public'] = instance_content.is_public
+ else:
+ initial_c['is_public'] = True
+ content_form = ContentForm(prefix="content", instance=instance_content, initial=initial_c)
+ media_form = MediaForm(prefix="media", instance=instance_media, initial=initial_m)
+ picture_form = PictureForm()
+
+ if instance_content is not None:
+ content_form.media_input_type = "link"
+
+ if request.user.is_staff:
+ content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
+
+ if transaction_succeed:
#Try to make sure the commit succeeded or not.
try:
transaction.commit()
@@ -302,6 +310,11 @@
transaction.rollback()
errors_transaction.append(_("Commit of the content creation failed"))
return False, False, False, False, False, errors_transaction
+ else:
+ transaction.rollback()
+ errors_transaction.append(_("Content creation failure"))
+ return False, False, False, False, False, errors_transaction
+
return content_form, media_form, picture_form, form_status, current_front_project, errors_transaction
@login_required
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/ldt_utils/views/group.py
--- a/src/ldt/ldt/ldt_utils/views/group.py Mon Nov 05 15:19:24 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/group.py Mon Nov 05 15:20:11 2012 +0100
@@ -2,13 +2,14 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import Group
from django.http import HttpResponseServerError
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from ldt.ldt_utils.forms import GroupAddForm
from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user
from ldt.security.utils import add_change_attr, get_userlist, get_userlist_group
from ldt.security.cache import get_cached_checker, cached_assign
from ldt.user.forms import PictureForm
+import logging
@login_required
@@ -41,37 +42,43 @@
if request.method == 'POST':
form = GroupAddForm(request.POST)
picture_form = PictureForm(None, request.POST, request.FILES)
-
- if form.is_valid():
- name = form.cleaned_data['name']
- members_list = form.cleaned_data['read_list']
- admin_list = form.cleaned_data['write_list']
-
- group = Group.objects.create(name=name)
- group.save()
- group.profile.description = form.cleaned_data['description']
- group.profile.save()
-
- picture_form.model = group
- if picture_form.is_valid():
- picture_form.save()
-
- cached_assign('is_owner_group', request.user, group)
- cached_assign('change_group', request.user, group)
- request.user.groups.add(group)
-
- for elem in members_list:
- if hasattr(elem, 'username'):
- elem.groups.add(group)
- if elem in admin_list:
- cached_assign('change_group', elem, group)
- form_status = 'saved'
- else:
- group.delete()
-
+ submit_action = request.REQUEST.get("submit_button", False)
+
+ if submit_action == 'close':
+ return redirect("groups-view")
+ else:
+ if form.is_valid():
+ name = form.cleaned_data['name']
+ members_list = form.cleaned_data['read_list']
+ admin_list = form.cleaned_data['write_list']
+
+ group = Group.objects.create(name=name)
+ group.save()
+ group.profile.description = form.cleaned_data['description']
+ group.profile.save()
+
+ picture_form.model = group
+ if picture_form.is_valid():
+ picture_form.save()
+
+ cached_assign('is_owner_group', request.user, group)
+ cached_assign('change_group', request.user, group)
+ request.user.groups.add(group)
+
+ for elem in members_list:
+ if hasattr(elem, 'username'):
+ elem.groups.add(group)
+ if elem in admin_list:
+ cached_assign('change_group', elem, group)
+ form_status = 'saved'
+ else:
+ group.delete()
else:
form = GroupAddForm()
picture_form = PictureForm()
+
+ if form_status == 'saved':
+ return redirect("groups-view")
return render_to_response("ldt/ldt_utils/create_group.html", {'group_edition': True, 'form' : form, 'form_status' : form_status,
'elem_list' : get_userlist(request.user), 'profile_picture_form': picture_form}, context_instance=RequestContext(request))
@@ -97,6 +104,8 @@
if is_owner_group:
group.delete()
form_status = 'deleted'
+ elif submit_action == 'close':
+ return redirect("groups-view")
else:
if form.is_valid() and picture_form.is_valid():
name = form.cleaned_data['name']
@@ -130,12 +139,11 @@
form = GroupAddForm(initial={'name':unicode(group.name)})
picture_form = PictureForm()
- if form_status != 'deleted':
+ if form_status == 'deleted' or form_status == 'saved':
+ return redirect("groups-view")
+ else:
member_list, admin_list = get_userlist_group(group, request.user)
profile_image = group.profile
- else:
- member_list = admin_list = []
- profile_image = ''
return render_to_response("ldt/ldt_utils/create_group.html", {'group_id' : group_id, 'form' : form, 'form_status' : form_status, 'group_edition': True,
'elem_list' : get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list,
diff -r 3ccedd271e36 -r 6ac668113c40 src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js Mon Nov 05 15:19:24 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Mon Nov 05 15:20:11 2012 +0100
@@ -358,35 +358,6 @@
$('.create_group',base_node).each(function(i){
$(this).attr("target","_iri");
});
-
- $('.create_group',base_node).nyroModal({
- filters: ['iriIframe'],
- sizes: {
- minW: '750',
- minH: '750'
- },
- showCloseButton: true,
- closeOnEscape:false,
- closeOnClick:false,
- callbacks: {
- afterShowCont: function(nm) {
- var iframe = nm.store.iframe;
- iframe.load(function(){
- var form_status = $(this).contents().find("#project_form_status").val();
- if(form_status === 'saved' || form_status === 'deleted' ) {
- $.nmTop().close();
- }
-
- });
- nm.store.iframe.width(740);
- nm.store.iframe.height(740);
- },
- afterClose: function(nm) {
- searchCallback($("#searchprojectsinput"), $("#groupslistcontainer"), groupfilterurl, 0);
- }
- }
- });
-
$('.create_group',base_node).each(function(i, e) {
nm = $(e).data('nmObj');