fix collection edit

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 02ab659759dc6866ba08dac306a0a4d217258b17..0cba31473a173287149dd957275d8f4c08427f10 100644 (file)
--- 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 453aec42b2cedffc5bca81fcbe2447df3edd2032..28d6f2bcaef0ae5a2dad9d64265b56d45e6e2ca1 100644 (file)
--- 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>