From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 26 Nov 2014 11:31:19 +0000 (+0100)
Subject: fix collection edit
X-Git-Tag: 1.5.0rc1~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1f09c289efc905e19497fa3f60103bee4f9fc332;p=telemeta.git

fix collection edit
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 02ab6597..0cba3147 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -778,8 +778,8 @@ class MediaCorpus(MediaBaseResource):
 
     children = models.ManyToManyField(MediaCollection, related_name="corpus",
                                       verbose_name=_('collections'),  blank=True, null=True)
-    recorded_from_year    = IntegerField(_('recording year (from)'), help_text='YYYY')
-    recorded_to_year      = IntegerField(_('recording year (until)'), help_text='YYYY')
+    recorded_from_year    = IntegerField(_('recording year (from)'), help_text=_('YYYY'))
+    recorded_to_year      = IntegerField(_('recording year (until)'), help_text=_('YYYY'))
 
     objects = MediaCorpusManager()
 
diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html
index 453aec42..28d6f2bc 100644
--- a/telemeta/templates/telemeta/collection_edit.html
+++ b/telemeta/templates/telemeta/collection_edit.html
@@ -11,7 +11,7 @@
 <div class="fixedWidthAsPlayer">
     <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
     {% block cancel %}
-    <a id="cancel" href="{% url "telemeta-collection-detail" collection.code %}">
+    <a id="cancel" href="{% url "telemeta-collection-detail" collection.public_id %}">
       <button type="button" class="btn btn-default">
         <span class="glyphicon glyphicon-remove"></span> {% trans "Cancel" %}
       </button>
@@ -63,7 +63,7 @@
 
     <div align="center" style="margin-top:3ex;">
     {% block cancel2 %}
-    <a id="cancel" href="{% url "telemeta-collection-detail" collection.code %}">
+    <a id="cancel" href="{% url "telemeta-collection-detail" collection.public_id %}">
       <button type="button" class="btn btn-default">
         <span class="glyphicon glyphicon-remove"></span> {% trans "Cancel" %}
       </button>