From dd2fa41a2d7705e466b4ae09840cffe061f58f69 Mon Sep 17 00:00:00 2001
From: Nazar Kotyuk <kotzillla@gmail.com>
Date: Tue, 27 May 2014 15:54:54 +0300
Subject: [PATCH] d13

---
 proj/urls.py     |  3 ++-
 service/admin.py | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/proj/urls.py b/proj/urls.py
index e78b9b2d..21923971 100644
--- a/proj/urls.py
+++ b/proj/urls.py
@@ -15,7 +15,7 @@ urlpatterns = patterns('',
     url(r'^', include('webinar.urls')),
     url(r'^', include('company.urls')),
     url(r'^', include('photoreport.urls')),
-    url(r'^', include('service.urls')),
+
 
     url(r'^', include('file.urls')),
     url(r'^', include('django_messages.expomap_urls')),
@@ -46,6 +46,7 @@ urlpatterns = patterns('',
     # admin part
     url(r'^search/', include('haystack.urls')),
     url(r'^admin/', include('proj.admin_urls')),
+    url(r'^', include('service.urls')),
     )
 
 # ajax urls
diff --git a/service/admin.py b/service/admin.py
index b176d543..584ec09e 100644
--- a/service/admin.py
+++ b/service/admin.py
@@ -32,7 +32,7 @@ def service_change(request, url):
         return HttpResponseRedirect('/admin/service/all')
     if request.POST:
         form = ServiceForm(request.POST)
-        form.fields['city'].choices = [(item.id, item.name) for item in City.objects.all()]
+        #form.fields['city'].choices = [(item.id, item.name) for item in City.objects.all()]
 
         if form.is_valid():
             form.save(service_id)
@@ -45,12 +45,12 @@ def service_change(request, url):
             data['currency'] = service.price.split(' ')[1]
         except:pass
         #countries sorted by this service
-        services_in_countries = Country.objects.filter(services=getattr(Country.services, str(service_id)))
+        #services_in_countries = Country.objects.filter(services=getattr(Country.services, str(service_id)))
 
-        data['europa'] = services_in_countries
-        data['asia'] = services_in_countries
-        data['africa'] = services_in_countries
-        data['america'] = services_in_countries
+        #data['europa'] = services_in_countries
+        #data['asia'] = services_in_countries
+        #data['africa'] = services_in_countries
+        #data['america'] = services_in_countries
         #hidden field
         data['service_id'] = service_id