rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_service_collision' into 'master'

Browse source 
Fix Service usage in machine templates.

See merge request federez/re2o!64
This commit is contained in:
chirac 2018-01-20 17:36:10 +01:00
commit 3648046ddf
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
machines/templates/machines/index_service.html
View file

@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>Liste des services</h2> <h2>Liste des services</h2>
{% can_create Service %} {% can_create machines.Service %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un service</a> <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un service</a>
{% acl_end %} {% acl_end %}
<a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service' %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs service</a> <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service' %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs service</a>

2
machines/templates/machines/sidebar.html
View file

@ -62,7 +62,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Gestion des nas Gestion des nas
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all Service %} {% can_view_all machines.Service %}
<a class="list-group-item list-group-item-info" href="{% url "machines:index-service" %}"> <a class="list-group-item list-group-item-info" href="{% url "machines:index-service" %}">
<i class="glyphicon glyphicon-list"></i> <i class="glyphicon glyphicon-list"></i>
Services (dhcp, dns...) Services (dhcp, dns...)

2
preferences/templates/preferences/display_preferences.html
View file

@ -179,7 +179,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
</table> </table>
<h2>Liste des services page d'accueil</h2> <h2>Liste des services page d'accueil</h2>
{% can_create Service%} {% can_create preferences.Service%}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un service</a> <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un service</a>
{% acl_end %} {% acl_end %}
<a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-services' %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs service</a> <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-services' %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs service</a>

4
re2o/templatetags/acl.py
View file

@ -106,7 +106,7 @@ MODEL_NAME = {
'Interface' : machines.models.Interface, 'Interface' : machines.models.Interface,
'Domain' : machines.models.Domain, 'Domain' : machines.models.Domain,
'IpList' : machines.models.IpList, 'IpList' : machines.models.IpList,
'Service' : machines.models.Service, 'machines.Service' : machines.models.Service,
'Service_link' : machines.models.Service_link, 'Service_link' : machines.models.Service_link,
'OuverturePortList' : machines.models.OuverturePortList, 'OuverturePortList' : machines.models.OuverturePortList,
'OuverturePort' : machines.models.OuverturePort, 'OuverturePort' : machines.models.OuverturePort,
@ -115,7 +115,7 @@ MODEL_NAME = {
'OptionalMachine': preferences.models.OptionalMachine, 'OptionalMachine': preferences.models.OptionalMachine,
'OptionalTopologie': preferences.models.OptionalTopologie, 'OptionalTopologie': preferences.models.OptionalTopologie,
'GeneralOption': preferences.models.GeneralOption, 'GeneralOption': preferences.models.GeneralOption,
'Service': preferences.models.Service, 'preferences.Service': preferences.models.Service,
'AssoOption': preferences.models.AssoOption, 'AssoOption': preferences.models.AssoOption,
'MailMessageOption': preferences.models.MailMessageOption, 'MailMessageOption': preferences.models.MailMessageOption,
# topologie # topologie