{% trans "share" %}
+
+{% trans "choose a profile image" %}
+
+
+
+
+
\ No newline at end of file
diff -r 163d00f55ffd -r f4cb93c06b42 src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py Mon Jan 02 18:11:07 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/content.py Tue Jan 03 14:26:19 2012 +0100
@@ -13,6 +13,7 @@
from ldt.ldt_utils.models import Content, Media
from ldt.security.utils import assign_perm_to_obj, add_change_attr, get_userlist, get_userlist_model, get_userlist_group
from ldt.security.cache import cached_assign
+from ldt.user.forms import PictureForm
from urllib2 import urlparse
import ldt.utils.path as ldt_utils_path
import logging
@@ -67,7 +68,7 @@
content_form = ContentForm(content_instance_val, prefix="content", instance=instance_content)
media_form = MediaForm(media_instance_val, request.FILES, prefix="media", instance=instance_media)
-
+
media_valid = media_form.is_valid()
content_valid = content_form.is_valid()
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)) #@UndefinedVariable
@@ -201,6 +202,7 @@
del content_defaults[key]
content, created = Content.safe_objects.get_or_create(iri_id=content_form.cleaned_data['iri_id'], defaults=content_defaults) #@UndefinedVariable
+
if not created:
content.save() # Check if user is allowed to change object before assigning permissions.
cached_assign('change_content', request.user, content)
@@ -219,6 +221,11 @@
for attribute in ('iriurl', 'title', 'description', 'duration', 'content_creation_date', 'tags', 'media_obj'):
setattr(content, attribute, content_defaults[attribute])
content.save()
+
+ picture_form = PictureForm(content, request.POST, request.FILES)
+ if picture_form.is_valid():
+ picture_form.save()
+
form_status = 'saved'
media_form = MediaForm(instance=media, prefix="media")
content_form = ContentForm(instance=content, prefix="content")
@@ -241,7 +248,6 @@
@login_required
def write_content(request, iri_id=None):
submit_action = request.REQUEST.get("submit_button", False)
- groups = request.user.groups.exclude(name=settings.PUBLIC_GROUP_NAME)
member_list = admin_list = []
if submit_action == "prepare_delete":
@@ -265,15 +271,18 @@
if iri_id:
create_content_action = reverse('ldt.ldt_utils.views.content.write_content', kwargs={'iri_id':iri_id})
+ profile_image = content_form.instance.image
else:
create_content_action = reverse('ldt.ldt_utils.views.content.write_content')
+ profile_image = ''
session_key = request.COOKIES[settings.SESSION_COOKIE_NAME]
cookie_name = settings.SESSION_COOKIE_NAME
content_form.fields["media_obj"].queryset = Media.safe_objects.all()
return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_action': create_content_action,
- 'elem_list': get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list, 'iri_id': iri_id, 'session_key':session_key, 'cookie_name':cookie_name}, context_instance=RequestContext(request))
+ 'elem_list': get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list, 'iri_id': iri_id, 'session_key':session_key,
+ 'cookie_name':cookie_name, 'profile_image': profile_image}, context_instance=RequestContext(request))
@login_required
def prepare_delete_content(request, iri_id=None):
diff -r 163d00f55ffd -r f4cb93c06b42 src/ldt/ldt/ldt_utils/views/group.py
--- a/src/ldt/ldt/ldt_utils/views/group.py Mon Jan 02 18:11:07 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/group.py Tue Jan 03 14:26:19 2012 +0100
@@ -8,6 +8,7 @@
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
@login_required
@@ -40,7 +41,8 @@
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']
@@ -48,22 +50,31 @@
group = Group.objects.create(name=name)
group.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'
+
+ 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()
- 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)}, context_instance=RequestContext(request))
+ 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))
@login_required
def update_group(request, group_id):
@@ -79,6 +90,7 @@
if request.method == "POST":
form = GroupAddForm(request.POST, instance=group)
+ picture_form = PictureForm(group, request.POST, request.FILES)
submit_action = request.REQUEST.get("submit_button", False)
if submit_action == 'delete':
@@ -86,7 +98,7 @@
group.delete()
form_status = 'deleted'
else:
- if form.is_valid():
+ if form.is_valid() and picture_form.is_valid():
name = form.cleaned_data['name']
new_member_list = form.cleaned_data['read_list']
old_member_list = group.user_set.exclude(id=request.user.id)
@@ -110,18 +122,22 @@
remove_perm('change_group', user, group)
group.save()
+ picture_form.save()
form_status = 'saved'
else:
- form = GroupAddForm(initial={'name':unicode(group.name)})
+ form = GroupAddForm(initial={'name':unicode(group.name)})
+ picture_form = PictureForm()
if form_status != 'deleted':
member_list, admin_list = get_userlist_group(group, request.user)
+ profile_image = group.profile.image
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,
- 'is_owner_group': is_owner_group}, context_instance=RequestContext(request))
+ 'is_owner_group': is_owner_group, 'profile_picture_form': picture_form, 'profile_image': profile_image}, context_instance=RequestContext(request))
diff -r 163d00f55ffd -r f4cb93c06b42 src/ldt/ldt/locale/en/LC_MESSAGES/django.mo
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
diff -r 163d00f55ffd -r f4cb93c06b42 src/ldt/ldt/locale/en/LC_MESSAGES/django.po
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Mon Jan 02 18:11:07 2012 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Jan 03 14:26:19 2012 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-23 16:02+0100\n"
+"POT-Creation-Date: 2012-01-03 14:14+0100\n"
"PO-Revision-Date: 2010-02-17 03:53+0100\n"
"Last-Translator: Yves-Marie Haussonne
+{% trans "choose a profile image" %}
+