Merge branch 'pad-management' of gitlab.constantvzw.org:osp/tools.ethertoff into pad-management

generator/models.py

@@ -89,7 +89,7 @@ class Link (object):
     if self.target and not self.resolved:
       debug(self.target, self.contentType)
       self.source = source
-      target = collectionFor(self.contentType).get(self.target)
+      target = collectionFor(self.contentType).get(self.target, label=self.label)
       if target:
         self.target = target
       else:
@@ -168,8 +168,8 @@ class LinkField(object):
     if type(target) is list:
       self.set(target[0], inline)
 
-    target = keyFilter(target)
-    self.value = Link(target, self.contentType, inline)
+    key = keyFilter(target)
+    self.value = Link(key, self.contentType, inline, label=target)
 
   # Directly construct a link
   # Circumvents the resolving through a collection
@@ -209,12 +209,12 @@ class MultiLinkField(object):
       for t in target:
         self.set(t, inline)
     else:
-      target = keyFilter(target)
+      key = keyFilter(target)
       for existingLink in self.value:
-        if existingLink.target == target:
+        if existingLink.target == key or existingLink.target == target:
           return existingLink
 
-      self.value.append(Link(target, self.contentType, inline))
+      self.value.append(Link(key, self.contentType, inline, label=target))
 
   def makeLink(self, source, target, inline=False, label=None):
     for existingLink in self.value:

generator/templates/produser.html

@@ -21,7 +21,7 @@
     {{ produser.content }}
   {% endif %}
   
-  {% if produser.events %}
+  {% if produser.events and produser.events.targets %}
     <h2>Activities</h2>
     <ul class="simplelist">
       {% for event in produser.events.targets %}
@@ -35,7 +35,7 @@
     </ul>
   {% endif %}
 
-  {% if produser.bibliography %}
+  {% if produser.bibliography and produser.bibliography.targets %}
     <h2>Bibliography</h2>
     <ul class="simplelist">
       {% for entry in produser.bibliography.targets %}