From d7a215003e7f6869c9caee453fd938c51567ad51 Mon Sep 17 00:00:00 2001
From: Vincent Fretin <vincent.fretin@gmail.com>
Date: Thu, 14 Feb 2013 15:59:55 +0100
Subject: [PATCH] we don't always have an url for a term

---
 src/collective/contact/widget/templates/checkbox_input.pt  | 5 +++--
 src/collective/contact/widget/templates/contact_display.pt | 4 +++-
 src/collective/contact/widget/templates/radio_input.pt     | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/collective/contact/widget/templates/checkbox_input.pt b/src/collective/contact/widget/templates/checkbox_input.pt
index 91a7086..8cbe233 100644
--- a/src/collective/contact/widget/templates/checkbox_input.pt
+++ b/src/collective/contact/widget/templates/checkbox_input.pt
@@ -39,8 +39,9 @@
     />
     <span class="label"><a tal:content="item/label"
       class="link-tooltip"
-      tal:omit-tag="python:item['value'] == '--NOVALUE--'"
-      tal:attributes="href python:view.tokenToUrl(item['value'])"
+      tal:define="url python:view.tokenToUrl(item['value'])"
+      tal:omit-tag="python:item['value'] == '--NOVALUE--' or not url"
+      tal:attributes="href url"
       href="">Label</a></span>
   </label>
 </span>
diff --git a/src/collective/contact/widget/templates/contact_display.pt b/src/collective/contact/widget/templates/contact_display.pt
index 4137472..180b791 100644
--- a/src/collective/contact/widget/templates/contact_display.pt
+++ b/src/collective/contact/widget/templates/contact_display.pt
@@ -22,7 +22,9 @@
     <div tal:repeat="term view/terms">
         <a tal:content="term/title"
            class="link-tooltip"
-           tal:attributes="href python:view.tokenToUrl(term.token)"
+           tal:define="url python:view.tokenToUrl(term.token)"
+           tal:omit-tag="python:not url"
+           tal:attributes="href url"
            tal:condition="python:not(term.token.startswith('#error-'))"
            />
     </div>
diff --git a/src/collective/contact/widget/templates/radio_input.pt b/src/collective/contact/widget/templates/radio_input.pt
index 8c9de70..68896ef 100644
--- a/src/collective/contact/widget/templates/radio_input.pt
+++ b/src/collective/contact/widget/templates/radio_input.pt
@@ -39,8 +39,9 @@
     />
     <span class="label"><a tal:content="item/label"
       class="link-tooltip"
-      tal:omit-tag="python:item['value'] == '--NOVALUE--'"
-      tal:attributes="href python:view.tokenToUrl(item['value'])"
+      tal:define="url python:view.tokenToUrl(item['value'])"
+      tal:omit-tag="python:item['value'] == '--NOVALUE--' or not url"
+      tal:attributes="href url"
       href="">Label</a></span>
   </label>
 </span>