Discrimination de l'historique par application.

cotisations/urls.py

@@ -104,6 +104,7 @@ urlpatterns = [
         r'history/(?P<object_name>\w+)/(?P<object_id>[0-9]+)$',
         re2o.views.history,
         name='history',
+        kwargs={'application':'cotisations'},
     ),
     url(r'^control/$',
         views.control,

machines/urls.py

@@ -80,6 +80,7 @@ urlpatterns = [
         r'history/(?P<object_name>\w+)/(?P<object_id>[0-9]+)$',
         re2o.views.history,
         name='history',
+        kwargs={'application':'machines'},
     ),
     url(r'^$', views.index, name='index'),
     url(r'^rest/mac-ip/$', views.mac_ip, name='mac-ip'),

preferences/urls.py

@@ -72,7 +72,8 @@ urlpatterns = [
     url(
         r'^history/(?P<object_name>\w+)/(?P<object_id>[0-9]+)$',
         re2o.views.history,
-        name='history'
+        name='history',
+        kwargs={'application':'preferences'},
         ),
     url(r'^$', views.display_options, name='display-options'),
 ]

re2o/views.py

@@ -54,41 +54,51 @@ def index(request):
 
 #: Binding the corresponding char sequence of history url to re2o models.
 HISTORY_BIND = {
-    'user' : users.models.User,
-    'ban' : users.models.Ban,
-    'whitelist' : users.models.Whitelist,
-    'school' : users.models.School,
-    'listright' : users.models.ListRight,
-    'serviceuser' : users.models.ServiceUser,
-    'service' : preferences.models.Service,
-    'facture' : cotisations.models.Facture,
-    'article' : cotisations.models.Article,
-    'paiement' : cotisations.models.Paiement,
-    'banque' : cotisations.models.Banque,
-    'switch' : topologie.models.Switch,
-    'port' : topologie.models.Port,
-    'room' : topologie.models.Room,
-    'stack' : topologie.models.Stack,
-    'model_switch' : topologie.models.ModelSwitch,
-    'constructor_switch' : topologie.models.ConstructorSwitch,
-    'machine' : machines.models.Machine,
-    'interface' : machines.models.Interface,
-    'alias' : machines.models.Domain,
-    'machinetype' : machines.models.MachineType,
-    'iptype' : machines.models.IpType,
-    'extension' : machines.models.Extension,
-    'soa' : machines.models.SOA,
-    'mx' : machines.models.Mx,
-    'txt' : machines.models.Txt,
-    'srv' : machines.models.Srv,
-    'ns' : machines.models.Ns,
-    'service' : machines.models.Service,
-    'vlan' : machines.models.Vlan,
-    'nas' : machines.models.Vlan,
+    'users' : {
+        'user' : users.models.User,
+        'ban' : users.models.Ban,
+        'whitelist' : users.models.Whitelist,
+        'school' : users.models.School,
+        'listright' : users.models.ListRight,
+        'serviceuser' : users.models.ServiceUser,
+    },
+    'preferences' : {
+        'service' : preferences.models.Service,
+    },
+    'cotisations' : {
+        'facture' : cotisations.models.Facture,
+        'article' : cotisations.models.Article,
+        'paiement' : cotisations.models.Paiement,
+        'banque' : cotisations.models.Banque,
+    },
+    'topologie' : {
+        'switch' : topologie.models.Switch,
+        'port' : topologie.models.Port,
+        'room' : topologie.models.Room,
+        'stack' : topologie.models.Stack,
+        'model_switch' : topologie.models.ModelSwitch,
+        'constructor_switch' : topologie.models.ConstructorSwitch,
+    },
+    'machines' : {
+        'machine' : machines.models.Machine,
+        'interface' : machines.models.Interface,
+        'alias' : machines.models.Domain,
+        'machinetype' : machines.models.MachineType,
+        'iptype' : machines.models.IpType,
+        'extension' : machines.models.Extension,
+        'soa' : machines.models.SOA,
+        'mx' : machines.models.Mx,
+        'txt' : machines.models.Txt,
+        'srv' : machines.models.Srv,
+        'ns' : machines.models.Ns,
+        'service' : machines.models.Service,
+        'vlan' : machines.models.Vlan,
+        'nas' : machines.models.Vlan,
+    },
 }
 
 @login_required
-def history(request, object_name, object_id):
+def history(request, application, object_name, object_id):
     """Render history for a model.
 
     The model is determined using the `HISTORY_BIND` dictionnary if none is
@@ -108,7 +118,7 @@ def history(request, object_name, object_id):
         Http404: This kind of models doesn't have history.
     """
     try:
-        model = HISTORY_BIND[object_name]
+        model = HISTORY_BIND[application][object_name]
     except KeyError as e:
         raise Http404(u"Il n'existe pas d'historique pour ce modèle.")
     try:

topologie/urls.py

@@ -49,7 +49,8 @@ urlpatterns = [
     url(
         r'^history/(?P<object_name>\w+)/(?P<object_id>[0-9]+)$',
         re2o.views.history,
-        name='history'
+        name='history',
+        kwargs={'application':'topologie'},
     ),
     url(r'^edit_port/(?P<port_id>[0-9]+)$', views.edit_port, name='edit-port'),
     url(r'^new_port/(?P<switch_id>[0-9]+)$', views.new_port, name='new-port'),

users/urls.py

@@ -97,7 +97,8 @@ urlpatterns = [
     url(
         r'^history/(?P<object_name>\w+)/(?P<object_id>[0-9]+)$',
         re2o.views.history,
-        name='history'
+        name='history',
+        kwargs={'application':'users'},
     ),
     url(r'^$', views.index, name='index'),
     url(r'^index_clubs/$', views.index_clubs, name='index-clubs'),