Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove obsolete views 

This functionality is part of the home view now.

(imported from commit 5f0327eb62840bf98af49566e6f3c0b86ca43b8d)
This commit is contained in:
Keegan McAllister 2012-10-11 11:23:22 -04:00
parent 648ed8bb0d
commit 5a7ff70c11
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
humbug/urls.py
View File

@ -22,9 +22,7 @@ urlpatterns = patterns('',
url(r'^accounts/register/', 'zephyr.views.register', name='register'),
url(r'^accounts/send_confirm/(?P<email>[\S]+)?', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/accounts_send_confirm.html'}, name='send_confirm'),
url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)', 'confirmation.views.confirm', name='confirm'),
url(r'^settings/manage/$', 'zephyr.views.manage_settings', name='manage_settings'),
url(r'^settings/change/$', 'zephyr.views.change_settings', name='change_settings'),
url(r'^subscriptions/$', 'zephyr.views.subscriptions', name='subscriptions'),
url(r'^json/subscriptions/list$', 'zephyr.views.json_list_subscriptions', name='list_subscriptions'),
url(r'^json/subscriptions/remove$', 'zephyr.views.json_remove_subscription', name='remove_subscription'),
url(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/favicon.ico'}),

20
zephyr/views.py
View File

@ -429,15 +429,6 @@ def gather_subscriptions(user_profile):
return sorted([get_display_recipient(sub.recipient) for sub in subscriptions
if sub.recipient.type == Recipient.STREAM])
@login_required
def subscriptions(request):
user_profile = UserProfile.objects.get(user=request.user)
return render_to_response('zephyr/subscriptions.html',
{'subscriptions': gather_subscriptions(user_profile),
'user_profile': user_profile},
context_instance=RequestContext(request))
@login_required
def json_list_subscriptions(request):
subs = gather_subscriptions(UserProfile.objects.get(user=request.user))
@ -504,17 +495,6 @@ def json_add_subscription(request):
actually_new_sub = sub_name
return json_success({"data": actually_new_sub})
@login_required
def manage_settings(request):
user_profile = UserProfile.objects.get(user=request.user)
return render_to_response('zephyr/settings.html',
{'user_profile': user_profile,
'email_hash': hashlib.md5(user_profile.user.email).hexdigest(),
},
context_instance=RequestContext(request))
@login_required
@require_post
def change_settings(request):