diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-16 16:12:15 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-16 16:12:15 +0100 |
| commit | e6801bc85e7162189f09a23edc7d0ff179f5ed62 (patch) | |
| tree | af55baffb99ba6cddc4e1f579b9fdd87a4964cc3 | |
| parent | eae762f5b3e3bc848cf8daf93d03ecac22b76a3e (diff) | |
| download | Chimère-e6801bc85e7162189f09a23edc7d0ff179f5ed62.tar.bz2 Chimère-e6801bc85e7162189f09a23edc7d0ff179f5ed62.zip | |
Fix "propose" url with new permalink
| -rw-r--r-- | chimere/views.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chimere/views.py b/chimere/views.py index 7264b0d..b83b102 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -134,15 +134,16 @@ def getShareUrl(request, area_name='', network='', attrs=''): return HttpResponse('') -def getShareNetwork(request, area_name='', marker=None): +def getShareNetwork(request, area_name='', marker=None, geo_type=None): """ Get URLs to share items """ parameters = "" if marker: - parameters = 'current_feature=%d' % marker.pk - parameters += "&checked_categories=%s" % "_".join( - [str(m.id) for m in marker.categories.all()]) + parameters = "{};;;{};{}-{};;;;;".format( + settings.CHIMERE_DEFAULT_ZOOM, + "-".join([str(m.id) for m in marker.categories.all()]), + geo_type or '', marker.pk) net_dct = getTinyfiedUrl(request, parameters, area_name) share_networks = [] for network in settings.CHIMERE_SHARE_NETWORKS: @@ -593,6 +594,8 @@ def getDetail(request, area_name, key, popup=False): cls = AggregatedRoute elif geo_type == 'polygon': cls = Polygon + else: + geo_type = 'marker' try: marker = cls.objects.filter(id=int(pk), status__in=['A', 'S'])[0] @@ -607,7 +610,7 @@ def getDetail(request, area_name, key, popup=False): if 'simple' in request.GET and request.GET['simple']: response_dct['simple'] = True response_dct['share_networks'], net_dct = \ - getShareNetwork(request, response_dct['area_name'], marker) + getShareNetwork(request, response_dct['area_name'], marker, geo_type) response_dct['share_url'] = net_dct['url'] net_dct['to'] = settings.CONTACT_EMAIL if net_dct['to']: |