Fix Service usage in machine templates.

machines/templates/machines/sidebar.html

@@ -62,7 +62,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         Gestion des nas
     </a>
     {% 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" %}">
         <i class="glyphicon glyphicon-list"></i>
         Services (dhcp, dns...)
@@ -72,6 +72,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-portlist" %}">
         <i class="glyphicon glyphicon-list"></i>
         Ouverture de ports
-    </a>   
+    </a>
     {% acl_end %}
 {% endblock %}

re2o/templatetags/acl.py

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