diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:08:51 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:08:51 +0100 | 
| commit | ded35ffba989c28d8dd515fc9c0f4e241038d668 (patch) | |
| tree | e756e63c9dca53bdf0f23e68a367a16b927ab61b /chimere/views.py | |
| parent | 5db6ae2fc14ebbec4b52151c7250ca0bba98bc02 (diff) | |
| parent | 7d8c3719bb2dfaa70b1d6c5e2a19c53588091d3b (diff) | |
| download | Chimère-ded35ffba989c28d8dd515fc9c0f4e241038d668.tar.bz2 Chimère-ded35ffba989c28d8dd515fc9c0f4e241038d668.zip  | |
Merge branch 'master' into saclay
Conflicts:
	chimere/admin.py
	chimere/models.py
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/tests.py
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/views.py b/chimere/views.py index 2a93f9a..a6b369b 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -87,7 +87,7 @@ def get_base_response(area_name=""):      area = None      if area_name:          try: -            area = Area.objects.get(urn=area_name) +            area = Area.objects.get(urn=area_name, available=True)          except ObjectDoesNotExist:              return None, redirect(reverse('chimere:index'))      else:  | 
