entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

general: use a common template for _detail.html views (#11203)

This commit is contained in:
Frédéric Péters 2016-06-05 09:04:53 +02:00
parent 0b58219f06
commit b2be2c604f
20 changed files with 42 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passerelle/apps/base_adresse/templates/base_adresse/base_adresse_detail.html
View File

@ -1,22 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'base_adresse-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>BaseAddresse - {{ object.title }}</h2>
{% if perms.base_adresse.change_base_adresse %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="base_adresse" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.base_adresse.delete_base_adresse %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="base_adresse" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>

19
passerelle/apps/bdp/templates/bdp/bdp_detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'bdp-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>BDP - {{ object.title }}</h2>
{% if perms.bdp.change_bdp %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="bdp" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.bdp.delete_bdp %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="bdp" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>

19
passerelle/apps/clicrdv/templates/clicrdv/clicrdv_detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'clicrdv-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>ClicRdv - {{ object.title }}</h2>
{% if perms.clicrdv.change_clicrdv %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="clicrdv" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.clicrdv.delete_clicrdv %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="clicrdv" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>

19
passerelle/apps/concerto/templates/concerto/concerto_detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'concerto-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Concerto - {{ object.title }}</h2>
{% if perms.concerto.change_concerto %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="concerto" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.concerto.delete_concerto %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="concerto" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

22
passerelle/apps/csvdatasource/templates/csvdatasource/csvdatasource_detail.html
View File

@ -1,26 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'csvdatasource-detail' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>{{ object.get_verbose_name }} - {{ object.title }}</h2>
{% if perms.csvdatasource.change_csvdatasource %}
<a rel="popup" class="button" href="{% url 'csvdatasource-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.csvdatasource.delete_csvdatasource %}
<a rel="popup" class="button" href="{% url 'csvdatasource-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>
{% blocktrans with file=object.csv_file %}File: {{ file }} {% endblocktrans %}

19
passerelle/apps/gdc/templates/gdc/gdc_detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'gdc-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>GDC - {{ object.title }}</h2>
{% if perms.gdc.change_gdc %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="gdc" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.gdc.delete_gdc %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="gdc" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>

19
passerelle/apps/pastell/templates/pastell/pastell_detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'pastell-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Pastell - {{ object.title }}</h2>
{% if perms.pastell.change_pastell %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="pastell" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.pastell.delete_pastell %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="pastell" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<p>

8
passerelle/base/models.py
View File

@ -137,6 +137,14 @@ class BaseResource(models.Model):
def get_add_url(cls):
return reverse('create-connector', kwargs={'connector': cls.get_connector_slug()})
def get_edit_url(self):
return reverse('edit-connector',
kwargs={'connector': self.get_connector_slug(), 'slug': self.slug})
def get_delete_url(self):
return reverse('delete-connector',
kwargs={'connector': self.get_connector_slug(), 'slug': self.slug})
class AccessRight(models.Model):
codename = models.CharField(max_length=100, verbose_name='codename')

11
passerelle/base/templatetags/passerelle.py
View File

@ -1,5 +1,6 @@
from django import template
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth import get_permission_codename
from ..models import AccessRight
@ -15,3 +16,13 @@ def access_rights_table(context, resource, permission):
context['resource_type'] = resource_type.id
context['resource_pk'] = resource.id
return context
@register.filter
def can_edit(obj, user):
return user.has_perm(get_permission_codename('change', obj._meta), obj=obj)
@register.filter
def can_delete(obj, user):
return user.has_perm(get_permission_codename('delete', obj._meta), obj=obj)

19
passerelle/contrib/agoraplus/templates/passerelle/contrib/agoraplus/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'agoraplus-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Agora+ - {{ object.title }}</h2>
{% if perms.agoraplus.change_agoraplus %}
<a rel="popup" class="button" href="{% url 'agoraplus-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.agoraplus.delete_agoraplus %}
<a rel="popup" class="button" href="{% url 'agoraplus-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/fake_family/templates/passerelle/contrib/fake_family/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'fake-family-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Fake Family - {{ object.title }}</h2>
{% if perms.passerelle_fake_family.change_passerelle_fake_family %}
<a rel="popup" class="button" href="{% url 'fake-family-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_fake_family.delete_passerelle_fake_family %}
<a rel="popup" class="button" href="{% url 'fake-family-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/iparapheur/templates/passerelle/contrib/iparapheur/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'iparapheur-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Iparapheur - {{ object.title }}</h2>
{% if perms.passerelle_iparapheur.change_passerelle_iparapheur %}
<a rel="popup" class="button" href="{% url 'iparapheur-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_iparapheur.delete_passerelle_iparapheur %}
<a rel="popup" class="button" href="{% url 'iparapheur-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/maarch/templates/passerelle/contrib/maarch/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'maarch-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Maarch - {{ object.title }}</h2>
{% if perms.passerelle_maarch.change_passerelle_maarch %}
<a rel="popup" class="button" href="{% url 'maarch-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_maarch.delete_passerelle_maarch %}
<a rel="popup" class="button" href="{% url 'maarch-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/meyzieu_newsletters/templates/passerelle/contrib/meyzieu_newsletters/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'meyzieu-newsletters-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Meyzieu newsletters - {{ object.title }}</h2>
{% if perms.passerelle_meyzieu_newsletters.change_passerelle_meyzieu_newsletters %}
<a rel="popup" class="button" href="{% url 'meyzieu-newsletters-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_meyzieu_newsletters.delete_passerelle_meyzieu_newsletters %}
<a rel="popup" class="button" href="{% url 'meyzieu-newsletters-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/seisin_by_email/templates/passerelle/contrib/seisin_by_email/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'seisin-by-email-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>{% trans 'Seisin by Email' %} - {{ object.title }}</h2>
{% if perms.passerelle_seisin_by_email.change_passerelle_seisin_by_email %}
<a rel="popup" class="button" href="{% url 'seisin-by-email-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_seisin_by_email.delete_passerelle_seisin_by_email %}
<a rel="popup" class="button" href="{% url 'seisin-by-email-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/solis_apa/templates/passerelle/contrib/solis_apa/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'solis-apa-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>SolisAPA - {{ object.title }}</h2>
{% if perms.passerelle_solis_apa.change_passerelle_solis_apa %}
<a rel="popup" class="button" href="{% url 'solis-apa-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.passerelle_solis_apa.delete_passerelle_solis_apa %}
<a rel="popup" class="button" href="{% url 'solis-apa-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/stub_invoices/templates/passerelle/stub-invoices/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'stub-invoices-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Stub Invoices - {{ object.title }}</h2>
{% if perms.stub_invoices.change_stub_invoice_connector %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="stub-invoices" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.stub_invoices.delete_stub_invoice_connector %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="stub-invoices" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<ul>

19
passerelle/contrib/teamnet_axel/templates/passerelle/contrib/teamnet_axel/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block more-user-links %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'teamnet-axel-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>Teamnet Axel - {{ object.title }}</h2>
{% if perms.teamnet_axel.change_teamnet_axel %}
<a rel="popup" class="button" href="{% url 'teamnet-axel-edit' slug=object.slug %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.teamnet_axel.delete_teamnet_axel %}
<a rel="popup" class="button" href="{% url 'teamnet-axel-delete' slug=object.slug %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>

19
passerelle/contrib/tlmcom/templates/passerelle/contrib/tlmcom/detail.html
View File

@ -1,23 +1,6 @@
{% extends "passerelle/manage.html" %}
{% extends "passerelle/manage/service_view.html" %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
{% if object.id %}
<a href="{% url 'tlmcom-view' slug=object.slug %}">{{ object.title }}</a>
{% endif %}
{% endblock %}
{% block appbar %}
<h2>TlmCom - {{ object.title }}</h2>
{% if perms.tlmcom.change_tlmcom %}
<a rel="popup" class="button" href="{% url 'edit-connector' slug=object.slug connector="tlmcom" %}">{% trans 'edit' %}</a>
{% endif %}
{% if perms.tlmcom.delete_tlmcom %}
<a rel="popup" class="button" href="{% url 'delete-connector' slug=object.slug connector="tlmcom" %}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}
<div>
<h3>{% trans 'Endpoints' %}</h3>

8
passerelle/templates/passerelle/manage/service_view.html
View File

@ -1,15 +1,19 @@
{% extends "passerelle/manage.html" %}
{% load i18n %}
{% load i18n passerelle %}
{% block breadcrumb %}
{{ block.super }}
<a href=".">{{ object.title }}</a>
<a href="{{object.get_absolute_url}}">{{ object.title }}</a>
{% endblock %}
{% block appbar %}
<h2>{{ view.model.get_verbose_name }} - {{ object.title }}</h2>
{% if object|can_edit:request.user %}
<a rel="popup" class="button" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>
{% endif %}
{% if object|can_delete:request.user %}
<a rel="popup" class="button" href="{{ object.get_delete_url }}">{% trans 'delete' %}</a>
{% endif %}
{% endblock %}
{% block content %}