Added redirect for /view/<id>, redirects to /view/<id>/<slug>

Author: goranche

web/tests/test_site.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 import pytest
+import datetime
+
+from web.processors.event import create_or_update_event
 
 @pytest.mark.django_db
 def test_unknown_URL(db, client):
@@ -20,3 +23,31 @@ def test_country_redirect(db, client):
 
 	assert response.status_code == 301
 	assert response['Location'][-5:] == '/#!AB'
+
+@pytest.mark.django_db
+def test_view_just_id(admin_user, db, client):
+	event_data = {
+		'audience': [3],
+		'theme': [1,2],
+		'contact_person': u'[email protected]',
+		'country': u'SI',
+		'description': u'Lorem ipsum dolor sit amet',
+		'event_url': u'',
+		'location': u'Tiraspol, Moldova',
+		'organizer': u'RailsGirls Moldova',
+		"creator": admin_user,
+		'start_date': datetime.datetime.now(),
+		'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+		'tags': [u'css', u'html', u'web'],
+		'title': u'Rails Moldova',
+	}
+
+	test_event = create_or_update_event(event_id=None, **event_data)
+
+	# Test without a slash in the end
+	response = client.get('/view/1')
+	assert response.status_code == 301
+
+	# Test with a slash in the end
+	response = client.get('/view/1/')
+	assert response.status_code == 302

web/urls.py

@@ -12,6 +12,7 @@
 	url(r'^add/$', 'events.add_event', name='web.add_event'),
 	url(r'^edit/(?P<event_id>\d+)/$', 'events.edit_event', name='web.edit_event'),
 	url(r'^view/(?P<event_id>\d+)/(?P<slug>[-\w]+)/$', 'events.view_event', name='web.view_event'),
+	url(r'^view/(?P<event_id>[0-9]+)/$', 'events.view_event_by_id', name='web.view_event_by_id'),
     url(r'^view/(?P<country_code>\w+)/$', 'events.view_event_by_country', name='web.view_event_by_country'),
 	url(r'^search/$', 'events.search_events', name='web.search_events'),
 	url(r'^approved/(?P<country_code>\w{2,3})/$', 'events.list_approved_events', name='web.list_events'),

web/views/events.py

@@ -39,6 +39,7 @@
 from web.decorators.events import is_ambassador
 
 from django.http import Http404
+from django.shortcuts import redirect
 from django.core.exceptions import ObjectDoesNotExist
 
 """
@@ -206,6 +207,21 @@ def view_event(request, event_id, slug):
 			'nearby': nearby
 		}, context_instance=RequestContext(request))
 
+def view_event_by_id(request, event_id):
+	try:
+		event = get_event_by_id(event_id)
+	except ObjectDoesNotExist as e:
+		raise Http404
+
+	return redirect(view_event, event_id, event.slug)
+	# next_event = get_next_or_previous(event, country_code=event.country)
+	# nearby = get_nearby_events(event, limit=4)
+	# return render_to_response(
+	# 	'pages/view_event.html', {
+	# 		'event': event,
+	# 		'next_event': next_event,
+	# 		'nearby': nearby
+	# 	}, context_instance=RequestContext(request))
 
 @login_required
 @is_ambassador