Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/blocks/alternate_multimedia.html
	chimere/templates/chimere/blocks/categories.html
	chimere/widgets.py

1 files changed, 9 insertions, 5 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 4dd6462..b40e58a 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -227,7 +227,6 @@ def get_edit_page(redirect_url, item_cls, item_form,
                            init_item.submiter_session_key == \
                                         request.session.session_key):
                 inst = init_item
-
             form = item_form(request.POST, request.FILES, instance=inst,
                              subcategories=listed_subcats)
             formset_multi = multimediafile_formset(request.POST, request.FILES,
@@ -246,6 +245,9 @@ def get_edit_page(redirect_url, item_cls, item_form,
                     item.ref_item = ref_item
                     if item.pk != ref_item.pk:
                         item.status = 'M'
+                        if hasattr(ref_item, 'has_associated_marker'):
+                            item.has_associated_marker = \
+                                                ref_item.has_associated_marker
                 elif not item.ref_item:
                     # initialisation
                     item.ref_item = item
@@ -629,17 +631,19 @@ def get_all_categories(request, area_name=None):
     return HttpResponse(jsons)
 
 def get_available_categories(request, area_name=None, area=None, status='A',
-                           force=None):
+                             force=None):
     '''
     Get category menu for a designed area
     '''
     context_data, redir = get_base_response(area_name)
     area = context_data["area"]
-    if area and area.dynamic_categories and \
-       not "current_extent" in request.GET:
-        return ""
     if redir:
         return redir
+    if area and area.dynamic_categories and \
+       not "current_extent" in request.GET:
+        context_data['sub_categories'] = []
+        return render_to_response('chimere/blocks/categories.html', context_data,
+                                       context_instance=RequestContext(request))
     if not area or not area.dynamic_categories:
         # Categories are not updated dynamicaly when the user move the map
         # so we return ALL the categories