From f1eaea6b74789bb73b2a640329004dbd908b1f7a Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Tue, 2 Aug 2011 18:40:25 +0200
Subject: [PATCH] [intranet] Ajouts pour l'IPv6

darcs-hash:20110802164025-ffbb2-4b6d7b7013c1d6a4edd32f8a16b79cd0a840961d.gz
---
 intranet/modules/mesMachines/main.py            | 7 ++++++-
 intranet/modules/mesMachines/static/machines.js | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/intranet/modules/mesMachines/main.py b/intranet/modules/mesMachines/main.py
index 765c9bd9..a18a58c4 100644
--- a/intranet/modules/mesMachines/main.py
+++ b/intranet/modules/mesMachines/main.py
@@ -70,6 +70,8 @@ class main(ModuleBase):
             machineInfos['mac'] = machine.mac()
             machineInfos['mid'] = machine.id()
             machineInfos['ip'] = machine.ip()
+            machineInfos['ipv6'] = str(machine.ipv6())
+            machineInfos['dnsIpv6'] = str(machine.dnsIpv6())
             # type
             if machine.objectClass == 'machineFixe':
                 machineInfos['type'] = 'fixe'
@@ -245,7 +247,10 @@ class main(ModuleBase):
             message = m.save()
             del m
         except ValueError, e:
-            del m
+            try:
+                del m
+            except:
+                pass
             return {'error':e.args[0].replace("\n","\\n")}
         crans.cp.log("Nouvelle machine %s" % nomNouvelleMachine, "MACHINES")
         return {'message':u"Machine enregistrée avec succès"}
diff --git a/intranet/modules/mesMachines/static/machines.js b/intranet/modules/mesMachines/static/machines.js
index c8c722b0..2d5bee77 100644
--- a/intranet/modules/mesMachines/static/machines.js
+++ b/intranet/modules/mesMachines/static/machines.js
@@ -125,6 +125,8 @@ Machines.infoPane.display = function(result)
       appendChildNodes(basicInfos, createDOM("DT", "type:" ), createDOM("DD",{},"Machine " + result.type ) );
       appendChildNodes(basicInfos, createDOM("DT", "mac: " ), createDOM("DD",{},result.mac ) );
       appendChildNodes(basicInfos, createDOM("DT", "ip: " ), createDOM("DD",{},result.ip ) );
+      appendChildNodes(basicInfos, createDOM("DT", "ipv6: " ), createDOM("DD",{},result.ipv6 ) );
+      appendChildNodes(basicInfos, createDOM("DT", "accessible directement en ipv6: " ), createDOM("DD",{},result.dnsIpv6 ) );
       if (result.ipsec)
 	appendChildNodes(basicInfos, createDOM("DT", "Clef Wifi:" ), createDOM("DD",{},result.ipsec ) ); 
       appendChildNodes( machinePane, basicInfos );