Migrates to 1.10

9 files changed, 12 insertions, 10 deletions

diff --git a/website/admin.py b/website/admin.py
index 80ea439..c5af339 100644
--- a/website/admin.py
+++ b/website/admin.py
@@ -1,5 +1,6 @@
+
 from django.contrib import admin
-from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
+from nested_inline.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
 
 from website.models import Nav, SubNav, Page, Link, LinkBox, TextBox, Block
 
diff --git a/website/models.py b/website/models.py
index 7afce12..7b7b228 100644
--- a/website/models.py
+++ b/website/models.py
@@ -78,7 +78,7 @@ class FOSSEEStats(models.Model):
 	type = models.CharField(max_length=50)
 	w_name = models.CharField(max_length=500)
 	body = models.TextField()
-	no_of_participant	 = models.IntegerField(max_length=5)
+	no_of_participant	 = models.IntegerField()
 	event_link = models.TextField()
 	startdate = models.DateTimeField()
 	starttime = models.TimeField()
diff --git a/website/templates/content.html b/website/templates/website/content.html
index 88e9736..88e9736 100644
--- a/website/templates/content.html
+++ b/website/templates/website/content.html
diff --git a/website/templates/footer.html b/website/templates/website/footer.html
index e69de29..e69de29 100644
--- a/website/templates/footer.html
+++ b/website/templates/website/footer.html
diff --git a/website/templates/header.html b/website/templates/website/header.html
index e69de29..e69de29 100644
--- a/website/templates/header.html
+++ b/website/templates/website/header.html
diff --git a/website/templates/home.html b/website/templates/website/home.html
index e69de29..e69de29 100644
--- a/website/templates/home.html
+++ b/website/templates/website/home.html
diff --git a/website/templates/page.html b/website/templates/website/page.html
index cebac2c..cebac2c 100644
--- a/website/templates/page.html
+++ b/website/templates/website/page.html
diff --git a/website/urls.py b/website/urls.py
index 808f537..8b753b5 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, include, url
-
-urlpatterns = patterns('',
+from django.conf.urls import  include, url
+from .views import dispatcher
+urlpatterns = [
 
 	# Main pages dispatcher
-	url(r'^$', 'website.views.dispatcher', name="home"),
-	url(r'^(?P<permalink>.+)/$', 'website.views.dispatcher', name="dispatcher"),
-)
+	url(r'^$', dispatcher, name="home"),
+	url(r'^(?P<permalink>.+)/$', dispatcher, name="dispatcher"),
+]
diff --git a/website/views.py b/website/views.py
index c0a61e1..36693bd 100644
--- a/website/views.py
+++ b/website/views.py
@@ -32,7 +32,7 @@ def get_blocks():
 def dispatcher(request, permalink=''):
 	if permalink == 'python-workshops':
 		blocks = get_blocks()
-		rows = FOSSEEStats.objects.using('fossee_in').filter(foss_name='Python', type ='Workshop').order_by('-w_id')
+		rows = FOSSEEStats.objects.using('fossee_new').filter(foss_name='Python', type ='Workshop').order_by('-w_id')
 		python_wokshop_page_content = Page.objects.get(permalink='python-workshops-page')
 
 		context = {
@@ -66,4 +66,5 @@ def dispatcher(request, permalink=''):
 			'footer': blocks['footer'],
 			'permalink': permalink
 		}
-	return render(request, 'website/templates/page.html', context)
+
+	return render(request, "website/page.html", context)