Merge lp:~mhall119/loco-team-portal/country-services into lp:loco-team-portal

[Michael Hall]

Because Country and Continent classes were added, we should make them available through the JSON service as well.

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'loco_directory/services/urls.py'
--- loco_directory/services/urls.py	2010-06-03 01:30:46 +0000
+++ loco_directory/services/urls.py	2010-06-21 16:26:21 +0000
@@ -8,6 +8,8 @@
 urlpatterns = patterns('',
     #venues
     url(r'^teams/(.*)$', 'services.views.team_service', name='team_service'),
+    url(r'^countries/(.*)$', 'services.views.country_service', name='country_service'),
+    url(r'^continents/(.*)$', 'services.views.continent_service', name='continent_service'),
     url(r'^events/(.*)$', 'services.views.team_event_service', name='team_event_service'),
     url(r'^global/(.*)$', 'services.views.global_event_service', name='global_event_service'),
     url(r'^comments/(.*)$', 'services.views.event_comment_service', name='event_comment_service'),

=== modified file 'loco_directory/services/views.py'
--- loco_directory/services/views.py	2010-06-17 11:54:45 +0000
+++ loco_directory/services/views.py	2010-06-21 16:26:21 +0000
@@ -1,4 +1,4 @@
-from teams.models import Team
+from teams.models import Team, Continent, Country
 from events.models import GlobalEvent, TeamEvent, TeamEventComment, Attendee, TeamAdministrator
 from venues.models import Venue
 from django.contrib.auth.models import User, Group
@@ -8,6 +8,12 @@
 def team_service(request, url):
     return model_service(Team, request, url)
 
+def country_service(request, url):
+    return model_service(Country, request, url)
+
+def continent_service(request, url):
+    return model_service(Continent, request, url)
+
 def team_event_service(request, url):
     return model_service(TeamEvent, request, url)