Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixes found during deployment

  • Loading branch information...
commit 824a35475fcbfe4f110d78f05310dd65a5a540f4 1 parent 4a544f8
@visiblegovernment authored
View
2  mainapp/feeds.py
@@ -32,13 +32,11 @@ def items(self, obj):
class CityIdFeed(CityFeedBase):
''' retrieve city by id '''
def get_object(self, request, id ):
- print "getting city by object"
return get_object_or_404(City, pk=id)
class CitySlugFeed(CityFeedBase):
''' retrieve city by slug '''
def get_object(self, request, slug ):
- print "getting city by slug"
return get_object_or_404(City, slug=slug)
class WardFeedBase(Feed):
View
2  mainapp/forms.py
@@ -339,7 +339,7 @@ def send_email(self,new_user):
'activation_link': "%s/accounts/activate/%s/" %(settings.SITE_URL,registration_profile.activation_key),
'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS })
- new_user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
+ new_user.email_user(subject, message, settings.EMAIL_FROM_USER)
# just override the AuthenticationForm username so that it's label
View
2  mainapp/models.py
@@ -172,7 +172,7 @@ def feed_url(self):
def save(self):
if not self.slug:
- self.slug = slugify(self.name )
+ self.slug = slugify(self.city.name + "-" + self.name )
super(Ward,self).save()
def __unicode__(self):
View
2  mainapp/views/cities.py
@@ -28,12 +28,10 @@ def show( request, city ):
context_instance=RequestContext(request))
def show_by_id(request, city_id ):
- print "getting city by id"
city = get_object_or_404(City, id=city_id)
return( show(request,city ))
def show_by_slug(request, city_slug ):
- print "getting city by slug"
city = get_object_or_404(City, slug=city_slug)
return( show(request,city ))
View
0  media/css/layout-8.css → media/css/layout-9.css
File renamed without changes
View
2  templates/base.html
@@ -20,7 +20,7 @@
<title>{% trans "FixMyStreet.ca" %} - {% block title %}{% trans "Home" %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="/media/css/global.css" />
<link rel="stylesheet" type="text/css" href="/media/css/typography.css" />
- <link rel="stylesheet" type="text/css" href="/media/css/layout-8.css" />
+ <link rel="stylesheet" type="text/css" href="/media/css/layout-9.css" />
<link rel="stylesheet" type="text/css" href="/media/css/colors.css" />
{% block css %}{% endblock %}
{% block script %}{% endblock %}
View
1  templates/registration/registration_complete.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load i18n %}
{% block title %}{% trans "Registration Complete" %}{% endblock %}
{% block content %}
<h2>{% trans "Check Your Inbox..." %}</h2>
Please sign in to comment.
Something went wrong with that request. Please try again.