scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

profile editor splited into three separate view

Browse source
This commit is contained in:
Igor Yanchenko 2012-03-05 11:07:29 +02:00
parent 39ae9fb98e
commit d2699a3d87
2 changed files with 60 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

22
djangobb_forum/urls.py
View file

@ -19,14 +19,8 @@ urlpatterns = patterns('',
url('^misc/$', forum_views.misc, name='misc'),
# User
url('^user/(?P<username>.*)/delete_avatar/$', forum_views.user,{
'action': 'delete_avatar'
}, name='forum_profile_delete_avatar'),
url('^user/(?P<username>.*)/upload_avatar/$', forum_views.user, {
'action': 'upload_avatar',
'form_class': UploadAvatarForm,
'template': 'djangobb_forum/upload_avatar.html'
}, name='forum_profile_upload_avatar'),
url('^user/(?P<username>.*)/delete_avatar/$', forum_views.delete_avatar, name='forum_profile_delete_avatar'),
url('^user/(?P<username>.*)/upload_avatar/$', forum_views.upload_avatar, name='forum_profile_upload_avatar'),
url('^user/(?P<username>.*)/privacy/$', forum_views.user, {
'section': 'privacy',
'form_class': PrivacyProfileForm,
@ -52,16 +46,8 @@ urlpatterns = patterns('',
'form_class': PersonalProfileForm,
'template': 'djangobb_forum/profile/profile_personal.html'
}, name='forum_profile_personal'),
url('^user/(?P<username>.*)/essentials/$', forum_views.user, {
'section': 'essentials',
'form_class': EssentialsProfileForm,
'template': 'djangobb_forum/profile/profile_essentials.html'
}, name='forum_profile_essentials'),
url('^user/(?P<username>.*)/$', forum_views.user, {
'section': 'essentials',
'form_class': EssentialsProfileForm,
'template': 'djangobb_forum/profile/profile_essentials.html'
}, name='forum_profile'),
url('^user/(?P<username>.*)/essentials/$', forum_views.user, name='forum_profile_essentials'),
url('^user/(?P<username>.*)/$', forum_views.user, name='forum_profile'),
url('^users/$', forum_views.users, name='forum_users'),
# Topic

90
djangobb_forum/views.py
View file

@ -334,42 +334,64 @@ def add_post(request, forum_id, topic_id):
@transaction.commit_on_success
def user(request, username, section=None, action=None, template=None, form_class=None):
def upload_avatar(request, username, template=None, form_class=None):
user = get_object_or_404(User, username=username)
if request.user.is_authenticated() and user == request.user or request.user.is_superuser:
if section:
profile_url = reverse('djangobb:forum_profile_%s' % section, args=[user.username])
form = build_form(form_class, request, instance=user.forum_profile,
extra_args={
'user_view': user,
'user_request': request.user,
'markup': user.forum_profile.markup,
})
if request.method == 'POST' and form.is_valid():
form.save()
#TODO any way to remove next two lines?
if section=='essentials':
set_language(request, profile.language)
return HttpResponseRedirect(profile_url)
return render(request, template, {'active_menu': section,
'profile': user,
'form': form,
})
elif action:
if action == 'upload_avatar':
form = build_form(form_class, request, instance=user.forum_profile)
if request.method == 'POST' and form.is_valid():
form.save()
return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
return render(request, template, {'form': form,
'avatar_width': forum_settings.AVATAR_WIDTH,
'avatar_height': forum_settings.AVATAR_HEIGHT,
})
elif action == 'delete_avatar':
profile = get_object_or_404(Profile, user=request.user)
profile.avatar = None
profile.save()
return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
form = build_form(form_class, request, instance=user.forum_profile)
if request.method == 'POST' and form.is_valid():
form.save()
return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
return render(request, template, {'form': form,
'avatar_width': forum_settings.AVATAR_WIDTH,
'avatar_height': forum_settings.AVATAR_HEIGHT,
})
else:
topic_count = Topic.objects.filter(user__id=user.id).count()
if user.forum_profile.post_count < forum_settings.POST_USER_SEARCH and not request.user.is_authenticated():
return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % request.path)
return render(request, template, {'profile': user,
'topic_count': topic_count,
})
@transaction.commit_on_success
def delete_avatar(request, username, section=None, action=None, template=None, form_class=None):
user = get_object_or_404(User, username=username)
if request.user.is_authenticated() and user == request.user or request.user.is_superuser:
profile = get_object_or_404(Profile, user=request.user)
profile.avatar = None
profile.save()
return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
else:
topic_count = Topic.objects.filter(user__id=user.id).count()
if user.forum_profile.post_count < forum_settings.POST_USER_SEARCH and not request.user.is_authenticated():
return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % request.path)
return render(request, template, {'profile': user,
'topic_count': topic_count,
})
@transaction.commit_on_success
def user(request, username, section='essentials', action=None, template='djangobb_forum/profile/profile_essentials.html', form_class=EssentialsProfileForm):
user = get_object_or_404(User, username=username)
if request.user.is_authenticated() and user == request.user or request.user.is_superuser:
profile_url = reverse('djangobb:forum_profile_%s' % section, args=[user.username])
form = build_form(form_class, request, instance=user.forum_profile,
extra_args={
'user_view': user,
'user_request': request.user,
'markup': user.forum_profile.markup,
})
if request.method == 'POST' and form.is_valid():
form.save()
#TODO any way to remove next two lines?
if section=='essentials':
set_language(request, profile.language)
return HttpResponseRedirect(profile_url)
return render(request, template, {'active_menu': section,
'profile': user,
'form': form,
})
else:
topic_count = Topic.objects.filter(user__id=user.id).count()
if user.forum_profile.post_count < forum_settings.POST_USER_SEARCH and not request.user.is_authenticated():