RSR v2.3.9.1 Yam Hotfix - Merge branch 'release/candidate' of github.com:akvo/akvo-rsr

Author: adriancollier

RELEASE_NOTES.md

@@ -7,6 +7,33 @@ Read more about [Akvo Products](http://akvo.org/products/).
 
 --------
 
+Akvo RSR ver 2.3.9.1 Yam - Hotfix
+
+Tuesday 8th Juyl 2014, adriancollier
+
+Included Changes
+---
+
+### Akvo Pages Keyword Maps
+
+With the implementation of keywords in [#620](https://github.com/akvo/akvo-rsr/issues/620) we noticed that the headline map on Akvo Pages was not updated to display the points for these keyword projects. This has been fixed so it matches the projects being displayed.
+
+Github issue [#671](https://github.com/akvo/akvo-rsr/issues/671)
+
+### Akvo Pages Drop-down Filtering
+
+The drop-down filters for Akvo Pages were not being correctly populated with the keyword content. After trying some things, it appeared that this area of code needs some further investigation to ensure it runs smoothly. In the meantime, we have removed the custom filtering so now all drop-downs contain all possibilities. We AIM to resolve this as soon as possible.
+
+Github issue [#673](https://github.com/akvo/akvo-rsr/issues/673)
+
+### Keyword API Management
+
+We implemented some changes in the API import processes to manage kaywords but it should only be possible to add keywords using the API, existing keywords on projects should not be removed.
+
+Github issue [#670](https://github.com/akvo/akvo-rsr/issues/670)
+
+--------
+
 Akvo RSR ver 2.3.9 Yam
 ---
 

akvo/api/resources/project.py

@@ -105,7 +105,6 @@ def obj_update(self, bundle, skip_errors=False, **kwargs):
             ProjectLocation.objects.filter(location_target=bundle.obj).delete()
             Partnership.objects.filter(project=bundle.obj).delete()
             Benchmark.objects.filter(project=bundle.obj).delete()
-            Keyword.objects.filter(project=bundle.obj).delete()
             bundle.obj.categories.clear()
 
         self.authorized_update_detail(self.get_object_list(bundle.request), bundle)

akvo/rsr/filters.py

@@ -73,8 +73,9 @@ def filter_by_budget_range(qs, what):
     currency        = django_filters.ChoiceFilter()
 
     def __init__(self, *args, **kwargs):
-        organisation_id = kwargs.pop('organisation_id', None)
+        request = kwargs.pop('request', None)
         super(ProjectFilterSet, self).__init__(*args, **kwargs)
+        projects = kwargs.pop('queryset', None)
 
         self.filters['title'].field.widget.input_type = 'search'
         self.filters['title'].field.widget.attrs = {'results': '5', 'autosave': 'project_search', 'placeholder': _(u'Project title or subtitle')}
@@ -83,29 +84,37 @@ def __init__(self, *args, **kwargs):
         choices.extend(list(CONTINENTS))
         self.filters['continent'].extra.update({'choices': choices})
 
-        self.filters['locations__country'].extra.update({'empty_label': _(u'All countries')})
 
-        if organisation_id:
-            org = Organisation.objects.get(pk=organisation_id)
-
-            countries = org.countries_where_active()
-
-            continents = [('', _(u'All continents'))]
-            choices = []
-            for country in countries:
-                if not country.continent_code in [code[0] for code in choices]:
-                    choices.append((country.continent_code, _(country.continent)))
-            continents.extend(sorted(choices))
-
-            self.filters['continent'].extra.update({'choices': continents})
-            self.filters['locations__country'].extra.update({'queryset': countries})
-
-            qs = org.partners()
+        # The request is sent when the call is made from a partner site view
+        if request:
+            partner_site = request.partner_site
+            organisation = partner_site.organisation
+            # If the partner site is "normal"
+            if partner_site.partner_projects:
+                countries = organisation.countries_where_active()
+
+                continents = [('', _(u'Active continents'))]
+                choices = []
+                for country in countries:
+                    if not country.continent_code in [code[0] for code in choices]:
+                        choices.append((country.continent_code, _(country.continent)))
+                continents.extend(sorted(choices))
+
+                self.filters['continent'].extra.update({'choices': continents})
+                self.filters['locations__country'].extra.update({'queryset': countries})
+                self.filters['locations__country'].extra.update({'empty_label': _(u'Active countries')})
+
+                organisations = organisation.partners()
+            # Keyword driven partner site.
+            # Performance issues preclude filtering of filter drop-downs right now
+            else:
+                organisations = Organisation.objects.all()
+                self.filters['locations__country'].extra.update({'empty_label': _(u'All countries')})
             self.filters['organisation'].extra.update({'empty_label': _(u'All partners')})
         else:
-            qs = Organisation.objects.all()
+            organisations = Organisation.objects.all()
             self.filters['organisation'].extra.update({'empty_label': _(u'All organisations')})
-        self.filters['organisation'].extra.update({'queryset': qs})
+        self.filters['organisation'].extra.update({'queryset': organisations})
 
         self.filters['andor'].field_class = BooleanField
         self.filters['status'].field_class = CheckboxMultipleChoiceField

akvo/rsr/middleware.py

@@ -161,6 +161,7 @@ def process_request(self, request, cname_domain=False, partner_site=None):
             )
             request.akvoapp_root_url = "http://%s" % request.app_domain
             request.organisation_id = partner_site.organisation.id
+            request.partner_site = partner_site
             request.default_language = partner_site.default_language
 
         request.domain_url = "http://%s" % settings.RSR_DOMAIN

akvo/rsr/templatetags/maps.py

@@ -171,7 +171,7 @@ def global_organisation_map(width, height, dynamic='dynamic'):
 
 
 @register.inclusion_tag('inclusion_tags/maps.html')
-def organisation_projects_map(organisation_id, width, height, dynamic='dynamic'):
+def organisation_projects_map(projects, width, height, dynamic='dynamic'):
     """
     params:
         organisation_id: id of organisation.
@@ -187,18 +187,27 @@ def organisation_projects_map(organisation_id, width, height, dynamic='dynamic')
 
     locations = []
 
-    projects = Project.objects.filter(partnerships__organisation=organisation_id).active()
+    # projects = Project.objects.filter(partnerships__organisation=organisation_id).active()
 
     for project in projects:
         proj_locations = ProjectLocation.objects.filter(location_target=project)
         for location in proj_locations:
             try:
                 thumbnail = project.current_image.extra_thumbnails['map_thumb'].absolute_url
-                locations.append([location.latitude,
-                                  location.longitude,
-                                  [str(project.pk),project.title.encode('utf8'), thumbnail, 'project']])
             except:
-                pass
+                thumbnail = ""
+            locations.append(
+                [
+                    location.latitude,
+                    location.longitude,
+                    [
+                        str(project.pk),
+                        project.title.encode('utf8'),
+                        thumbnail,
+                        'project'
+                    ]
+                ]
+            )
 
     template_context = {
         'map_id': map_id,

akvo/rsr/views_partner_sites/base.py

@@ -170,5 +170,5 @@ def get_queryset(self):
         return ProjectFilterSet(
             self.request.GET.copy() or None,
             queryset=projects,
-            organisation_id=self.request.organisation_id
+            request=self.request
         )

akvo/templates/partner_sites/home.html

@@ -31,7 +31,7 @@
     </div>
   </div>
   <div class="two_col_right whitebox">
-    {% organisation_projects_map request.organisation_id 470 250 'dynamic' %}
+    {% organisation_projects_map sorted_projects 470 250 'dynamic' %}
   </div>
   <div class="clear"></div>
   <h1 class="marg_top20">{% trans "Find projects" %}</h1>