From e73a27f742e0eebae186d55ed3d033b48af6bf52 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Mon, 6 Feb 2012 14:59:44 +0100
Subject: [PATCH] bugfixes

---
 telemeta/models/core.py                          | 5 ++++-
 telemeta/templates/telemeta/resource_add.html    | 2 +-
 telemeta/templates/telemeta/resource_detail.html | 2 +-
 telemeta/templates/telemeta/resource_edit.html   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index e4b581ad..e5a2078e 100644
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -180,7 +180,10 @@ class DurationField(models.Field):
 
     def get_db_prep_value(self, value, connection=None, prepared=False):
         # Casts times into the format expected by the backend
-        return value.as_seconds()
+        try:
+            return value.as_seconds()
+        except:
+            return value
 
     def value_to_string(self, obj):
         val = self._get_val_from_obj(obj)
diff --git a/telemeta/templates/telemeta/resource_add.html b/telemeta/templates/telemeta/resource_add.html
index 509ef2aa..8d74917a 100644
--- a/telemeta/templates/telemeta/resource_add.html
+++ b/telemeta/templates/telemeta/resource_add.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-<img src="{% url telemeta-images resource.icon %}" style="vertical-align:middle" /> {{ type }} : {% trans "New" %}
+<img src="{% url telemeta-type-images type %}" style="vertical-align:middle" /> {{ type }} : {% trans "New" %}
 {% endblock %}
 
 {% block title_buttons %}
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index d2ea8650..5f07ab7a 100644
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -10,7 +10,7 @@
 {% if resource %}
 
 {% block title %}
-    <img src="{% url telemeta-images resource.icon %}" style="vertical-align:middle" />
+    <img src="{% url telemeta-type-images type %}" style="vertical-align:middle" />
     {{ type|capitalize }} :
     <a href="{% url telemeta-resource-detail type resource.public_id %}">{{ resource.title }}</a>
 {% endblock %}
diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html
index d64d6ae3..4ddbd7f6 100644
--- a/telemeta/templates/telemeta/resource_edit.html
+++ b/telemeta/templates/telemeta/resource_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-<img src="{% url telemeta-images resource.icon %}" style="vertical-align:middle" /> {{ type }} : {{ resource }}
+<img src="{% url telemeta-type-images type %}" style="vertical-align:middle" /> {{ type }} : {{ resource }}
 {% endblock %}
 {% block title_buttons %}
     <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-- 
2.39.5