diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
| commit | 40e3f0a927b22fef64b6a59c006511b4ba243a07 (patch) | |
| tree | cde63d0487fe0112c1d9c243701a48d53075a30e /chimere/views.py | |
| parent | 4bc82f3f73577118d3cc534eaf749d16321c552a (diff) | |
| parent | 58aba7b0661d51e98132e2ed1b726c865316b4a2 (diff) | |
| download | Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.tar.bz2 Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chimere/views.py b/chimere/views.py index fd8f927..7c983a3 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -26,7 +26,7 @@ Views of the project import datetime from itertools import groupby -import simplejson +import re from django.conf import settings from django.core import serializers @@ -182,7 +182,8 @@ def get_edit_page(redirect_url, item_cls, item_form, return redir, None, None if 'area_name' in response_dct: area_name = response_dct['area_name'] - subcategories = SubCategory.getAvailable(cat_type, area_name) + subcategories = SubCategory.getAvailable(cat_type, area_name, + public=True) listed_subcats = [] if subcategories: for cat, subcats in subcategories: @@ -688,6 +689,7 @@ def getTinyfiedUrl(request, parameters, area_name=''): if response_dct['area_name'] else '') + '/', urn]) if not url.startswith('http'): url = get_base_uri(request) + url + url = re.sub("([^:])\/\/", "\g<1>/", url) text = settings.PROJECT_NAME if 'current_feature' in parameters: for item in parameters.split('&'): |