# HG changeset patch # User grandjoncl # Date 1360854151 -3600 # Node ID 39ba26f638b895098b38158acd5320f78f0aebad # Parent cfa34e39a3b86c84241156d592b60a18393c4477 clean loggers, change partner.py diff -r cfa34e39a3b8 -r 39ba26f638b8 .pydevproject --- a/.pydevproject Thu Feb 14 15:13:30 2013 +0100 +++ b/.pydevproject Thu Feb 14 16:02:31 2013 +0100 @@ -1,14 +1,14 @@ - - -python_polemictweet -python 2.7 - -/polemictweet/src - - -DJANGO_MANAGE_LOCATION -src/manage.py -DJANGO_SETTINGS_MODULE -polemictweet.settings - - + + +python_polemictweet +python 2.7 + +/polemictweet_dev/src + + +DJANGO_MANAGE_LOCATION +src/manage.py +DJANGO_SETTINGS_MODULE +polemictweet.settings + + diff -r cfa34e39a3b8 -r 39ba26f638b8 src/polemictweet/urls.py --- a/src/polemictweet/urls.py Thu Feb 14 15:13:30 2013 +0100 +++ b/src/polemictweet/urls.py Thu Feb 14 16:02:31 2013 +0100 @@ -2,6 +2,7 @@ from polemictweet.views.home import root_home from polemictweet.views.event import create_event, display_event, add_live, add_content from polemictweet.views.group import create_group, display_group +from polemictweet.views.partner import create_partner # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -25,6 +26,7 @@ url(r'^event_admin/add_content/(?P.*)$', add_content, name='add_content'), url(r'^event/(?P.*)$', display_event, name='display_event'), url(r'^group_admin/create_group/$', create_group, name="create_group"), + url(r'^partner_admin/create_partner/$', create_partner, name="create_partner"), url(r'^group_admin/modif_group/(?P.*)$', create_group, name='modif_group'), url(r'^group/(?P.*)$', display_group, name='display_group'), (r'^i18n/', include('django.conf.urls.i18n')), diff -r cfa34e39a3b8 -r 39ba26f638b8 src/polemictweet/views/event.py --- a/src/polemictweet/views/event.py Thu Feb 14 15:13:30 2013 +0100 +++ b/src/polemictweet/views/event.py Thu Feb 14 16:02:31 2013 +0100 @@ -36,13 +36,11 @@ for partner in init_partners : old_partners.append(partner.partner) - logger.debug('name '+str(partner.partner.name)) old_partners_id.append(partner.partner.id) for organisator in init_organisators : old_organisators.append(organisator.partner) old_organisators_id.append(organisator.partner.id) - logger.debug('name '+str(organisator.partner.name)) else: diff -r cfa34e39a3b8 -r 39ba26f638b8 src/polemictweet/views/group.py --- a/src/polemictweet/views/group.py Thu Feb 14 15:13:30 2013 +0100 +++ b/src/polemictweet/views/group.py Thu Feb 14 16:02:31 2013 +0100 @@ -7,6 +7,7 @@ from polemictweet.forms import GroupForm from django.utils.translation import ugettext as _, get_language from django.forms.models import model_to_dict +from polemictweet.utils.translate_language import get_translation_languages import sys import logging @@ -61,12 +62,7 @@ submit_action = request.REQUEST.get("submit_button", False) current_language = get_language().split("-")[0] - all_languages = settings.LANGUAGES - translation_languages = [] - - for l in all_languages: - if l[0] != current_language: - translation_languages.append(l[0]) + translation_languages = get_translation_languages() if submit_action=="close": return render_to_response('home.html', {'message': "You saved your group", 'translation_languages' : translation_languages, 'current_language' : current_language}, context_instance=RequestContext(request)) diff -r cfa34e39a3b8 -r 39ba26f638b8 src/polemictweet/views/partner.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/polemictweet/views/partner.py Thu Feb 14 16:02:31 2013 +0100 @@ -0,0 +1,39 @@ +from django.conf import settings +from django.core.urlresolvers import reverse +from django.shortcuts import render_to_response +from django.template import RequestContext +from polemictweet.forms import PartnerForm +from django.utils.translation import get_language +from polemictweet.utils.translate_language import get_translation_languages +import sys +import logging + +logger = logging.getLogger(__name__) + + +def create_partner(request): + submit_action = request.REQUEST.get("submit_button", False) + current_language = get_language().split("-")[0] + translation_languages = get_translation_languages() + + if submit_action=="close": + return render_to_response('home.html', {'message': "You didn't create any partner", 'translation_languages' : translation_languages, 'current_language' : current_language}, context_instance=RequestContext(request)) + + else : + + form_status = "none" + if request.method == "POST" : + partner_form = PartnerForm(request.POST, request.FILES) + is_valid = partner_form.is_valid() + if is_valid : + partner_form.save() + form_status = "saved" + else: + partner_form = PartnerForm() + + if form_status=='saved' or form_status=='deleted': + return render_to_response('home.html', {'message': "You creates a partner", 'translation_languages' : translation_languages, 'current_language' : current_language}, context_instance=RequestContext(request)) + else : + create_partner_action = reverse('polemictweet.views.partner.create_partner') + return render_to_response('create_partner.html', {'partner_form':partner_form, 'form_status': form_status, + 'create_partner_action': create_partner_action, 'current_language' : current_language }, context_instance=RequestContext(request))