Minor fixes around sourcing.

ANCIR · Mar 30, 2015 · 38ecbf5 · 38ecbf5
1 parent c25dd49
commit 38ecbf5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/connectedafrica/default_settings.py b/connectedafrica/default_settings.py
@@ -28,7 +28,7 @@
 DOCCLOUD_PROJECTID = int(os.environ.get('DOCCLOUD_PROJECTID', '130'))
 
 SOURCE_NAMES = {
-    'za-new-import.popit.mysociety.org': "People's Assembly Data",
-    'www.windeedsearch.co.za': "Windeed CIPC Search",
-    'www.jse.co.za': "Johannesburg Stock Exchange"
+    'za-new-import.popit.mysociety.org': "People's Assembly",
+    'www.windeedsearch.co.za': "Windeed CIPC",
+    'www.jse.co.za': "JSE"
 }
diff --git a/connectedafrica/templates/profile.html b/connectedafrica/templates/profile.html
@@ -31,9 +31,12 @@ <h1>
         <td class="property-value">
           {{property.value}}
           {% if property.source_url %}
-            <a href="{{ property.source_url }}" class="source-ref"
+            <!--a href="{{ property.source_url }}" class="source-ref"
               title="Source: {{ property.source_url | source_readable }}"
-              data-toggle="tooltip" data-placement="right"><i class="fa fa-external-link-square"></i></a>
+              data-toggle="tooltip" data-placement="right"><i class="fa fa-external-link-square"></i></a-->
+            <span class="source-ref"
+              title="Source: {{ property.source_url | source_readable }}"
+              data-toggle="tooltip" data-placement="right"><i class="fa fa-external-link-square"></i></span>
           {% endif %}
         </td>
       </tr>
@@ -79,7 +82,7 @@ <h3 class="section-title">{{ section.schema.meta.section_label or section.schema
           <th>{{v}}</th>
         {% endfor %}
         <th>Dates</th>
-        <th></th>
+        <th>Source</th>
       </tr>
       {% for relation in section.relations %}
         <tr>
@@ -94,9 +97,10 @@ <h3 class="section-title">{{ section.schema.meta.section_label or section.schema
           </td>
           <td width="1%">
             {% if relation | relation_source %}
-              <a href="{{ relation | relation_source }}" class="source-ref"
+              {{ relation | relation_source | source_readable }}
+              <!--a href="{{ relation | relation_source }}" class="source-ref"
                 title="Source: {{ relation | relation_source | source_readable }}"
-                data-toggle="tooltip" data-placement="left"><i class="fa fa-external-link-square"></i></a>
+                data-toggle="tooltip" data-placement="left"><i class="fa fa-external-link-square"></i></a-->
             {% endif %}
           </td>
         </tr>

diff --git a/connectedafrica/util/properties.py b/connectedafrica/util/properties.py
@@ -42,7 +42,9 @@ def __init__(self, obj):
     @property
     def properties(self):
         for name, data in self.obj.properties.items():
-            yield Property(data, self.attributes.get(name))
+            attr = self.attributes.get(name)
+            if attr is not None:
+                yield Property(data, attr)
 
     def __getattr__(self, name):
         return self.get(name)