Fix funders

journals/models.py

@@ -463,6 +463,11 @@ class Publication(models.Model):
                 return val
         raise KeyError
 
+    def get_all_funders(self):
+        from funders.models import Funder
+        return Funder.objects.filter(
+            models.Q(grants__publications=self) | models.Q(publications=self)).distinct()
+
     @property
     def doi_string(self):
         return '10.21468/' + self.doi_label

journals/templates/journals/publication_detail.html

@@ -107,10 +107,10 @@
                 {% endfor %}
             </ul>
 
-            {% if publication.funders_generic.all %}
-                <h3>Funder{{ publication.funders_generic.count|pluralize }} for this publication</h3>
+            {% if publication.get_all_funders %}
+                <h3>Funder{{ publication.get_all_funders|length|pluralize }} for this publication</h3>
                 <ul>
-                    {% for funder in publication.funders_generic.all %}
+                    {% for funder in publication.get_all_funders %}
                         <li><a href="{{ funder.get_absolute_url }}">{{ funder }}</a></li>
                     {% endfor %}
                 </ul>