fix resource edit buttons and links, fix many redirect links in views

diff --git a/telemeta/templates/telemeta/resource_add.html b/telemeta/templates/telemeta/resource_add.html
index b46553cbd744192e0391777252b17c02b2caf702..fce7219813145eea76c40ff4c6046d2912be167b 100644 (file)
--- a/telemeta/templates/telemeta/resource_add.html
+++ b/telemeta/templates/telemeta/resource_add.html
@@ -8,6 +8,10 @@
 
 {% block title_buttons %}
     <a href="/archives/{{type}}/" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
+    <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_addResourceForm').submit(); return false;">{% trans "Save" %}</a>
+    {% endif %}
+
 {% endblock %}
 
 
@@ -29,8 +33,9 @@
         </table>
         <div align="center" style="margin-top:3ex;">
             <a href="/archives/{{type}}/" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-            <a href="#" class="component_icon button icon_save"
-                onclick="document.getElementById('_addResourceForm').submit(); return false;">{% trans "Save" %}</a>
+            {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
+            <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_addResourceForm').submit(); return false;">{% trans "Save" %}</a>
+            {% endif %}
         </div>
         </form>
         </div>

diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index 036bc21578c563e4cc1b816f421a55a562ec2695..dd1eb0fd468f0b37edddcb66f5fb16faebcc5afc 100644 (file)
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -39,7 +39,7 @@ jQuery(document).ready(function(){
 
 {% block title_buttons %}
   <div class="fixedWidthAsPlayer">
-    {% if user.is_authenticated and perms.telemeta.change_mediaresource %}
+    {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
       <a href="{% url telemeta-resource-edit type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
       <a href="{% url telemeta-resource-copy type resource.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
      {% endif %}

diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html
index a8ddadf49154ec9c40bfb4a8660445844a41bdd4..e9a8229c3780009b4ca2e230f984d5f4309cea23 100644 (file)
--- a/telemeta/templates/telemeta/resource_edit.html
+++ b/telemeta/templates/telemeta/resource_edit.html
@@ -7,11 +7,14 @@
 {% endblock %}
 {% block title_buttons %}
     <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
+    <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
+    {% endif %}
 {% endblock %}
 
 {% block infos %}
      <div class="infos">
-      <form method="post" id="_editCollectionForm" action="">{% csrf_token %}
+      <form method="post" id="_editForm" action="">{% csrf_token %}
        <table>
        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
        {% for field in form %}
@@ -24,14 +27,16 @@
             {% endif %}
         </tr>
        {% endfor %}
+      <tr>
+          <td style="padding-top: 1em">{% trans "Related media" %}:</td>
+          <td style="padding-top: 1em"><a href="{% url telemeta-resource-related_edit type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
+      </tr>
        </table>
         <div align="center" style="margin-top:3ex;">
          <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-         {% if perms.telemeta.change_mediaresource %}
-         <a href="{% url telemeta-resource-related_edit type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a>
+         {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
+         <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
          {% endif %}
-         <a href="#" class="component_icon button icon_save"
-   onclick="document.getElementById('_editCollectionForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
       </form>
      </div>

diff --git a/telemeta/templates/telemeta/resource_list.html b/telemeta/templates/telemeta/resource_list.html
index 8a901a96994fc24c4b527afe8f57e7625cd67d2d..ced3afb1ac650f9c86c34671d00fdee5373ebc8b 100644 (file)
--- a/telemeta/templates/telemeta/resource_list.html
+++ b/telemeta/templates/telemeta/resource_list.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block title_buttons %}
-    {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
+    {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
       <a href="{% url telemeta-resource-add type %}" class="component_icon button icon_add">{% trans "Add" %}</a>
     {% endif %}
 {% endblock %}

diff --git a/telemeta/templates/telemeta/resource_related_edit.html b/telemeta/templates/telemeta/resource_related_edit.html
index 066359595bf680a570436f502026942702b63749..40e13cebe67ea2a6d505a0a21fc6dcd8345e186e 100644 (file)
--- a/telemeta/templates/telemeta/resource_related_edit.html
+++ b/telemeta/templates/telemeta/resource_related_edit.html
@@ -10,6 +10,7 @@
 
 {% block title_buttons %}
  <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
 {% block content %}
@@ -37,8 +38,7 @@
       <div align="center">
         <a href="{% url telemeta-resource-detail type resource.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-        <a href="#" class="component_icon button icon_save"
-   onclick="document.getElementById('_editMediaRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
+        <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index a46d2bf1eb5589dd69a08ff5934597279653f6db..116a4358781007edee99de71aff28d2ede1db083 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -200,7 +200,7 @@ class ItemView(object):
                     for analysis in analyses:
                         analysis.delete()
                 item.set_revision(request.user)
-                return HttpResponseRedirect('/archives/items/'+code)
+                return redirect('telemeta-item-detail', code)
         else:
             item_form = MediaItemForm(instance=item, prefix='item')
             format_form = FormatForm(instance=format, prefix='format')
@@ -260,7 +260,7 @@ class ItemView(object):
                 code = item_form.cleaned_data['code']
                 if not code:
                     code = str(item.id)
-                return HttpResponseRedirect('/archives/items/'+code)
+                return redirect('telemeta-item-detail', code)
         else:
             item_form = MediaItemForm(instance=item, prefix='item')
             format_form = FormatForm(instance=format, prefix='format')
@@ -304,7 +304,7 @@ class ItemView(object):
                     keyword.save()
 
                 item.set_revision(request.user)
-                return HttpResponseRedirect('/archives/items/'+code)
+                return redirect('telemeta-item-detail', code)
         else:
             item = MediaItem.objects.get(public_id=public_id)
             items = MediaItem.objects.filter(collection=item.collection)
@@ -327,7 +327,7 @@ class ItemView(object):
         item = MediaItem.objects.get(public_id=public_id)
         collection = item.collection
         item.delete()
-        return HttpResponseRedirect('/archives/collections/'+collection.code)
+        return redirect('telemeta-collection-detail', collection.code)
 
     def item_analyze(self, item):
         analyses = MediaItemAnalysis.objects.filter(item=item)

diff --git a/telemeta/views/ressource.py b/telemeta/views/ressource.py
index 9be876464b775a54cf7eda24f017b558313bd932..6ed26120f2cb63bc5c13a4a0f72cd4c6e4f97732 100644 (file)
--- a/telemeta/views/ressource.py
+++ b/telemeta/views/ressource.py
@@ -100,7 +100,7 @@ class ResourceView(object):
                     code = public_id
                 form.save()
                 resource.set_revision(request.user)
-                return HttpResponseRedirect('/archives/'+self.type+'/'+code)
+                return redirect('telemeta-resource-detail', self.type, code)
         else:
             form = self.form(instance=resource)
         return render(request, template, {'resource': resource, 'type': type, 'form': form,})
@@ -118,7 +118,7 @@ class ResourceView(object):
                     code = public_id
                 form.save()
                 resource.set_revision(request.user)
-                return HttpResponseRedirect('/archives/'+self.type +'/'+code)
+                return redirect('telemeta-resource-detail', self.type, code)
         else:
             form = self.form(instance=resource)
         return render(request, template, {'resource': resource, 'type': type, 'form': form,})
@@ -136,7 +136,7 @@ class ResourceView(object):
                     code = public_id
                 resource.save()
                 resource.set_revision(request.user)
-                return HttpResponseRedirect('/archives/'+self.type +'/'+code)
+                return redirect('telemeta-resource-detail', self.type, code)
         else:
             resource = self.model.objects.get(code=public_id)
             form = self.form(instance=resource)
@@ -179,7 +179,7 @@ class ResourceView(object):
             if formset.is_valid():
                 formset.save()
                 resource.set_revision(request.user)
-                return HttpResponseRedirect('/archives/'+self.type+'/'+public_id)
+                return redirect('telemeta-resource-edit', self.type, public_id)
         else:
             formset = ResourceRelatedFormSet(instance=resource)
         return render(request, template, {'resource': resource, 'type': type, 'formset': formset,})