crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[intranet] Ajouts pour l'IPv6

Browse source 
darcs-hash:20110802164025-ffbb2-4b6d7b7013c1d6a4edd32f8a16b79cd0a840961d.gz
This commit is contained in:
Nicolas Dandrimont 2011-08-02 18:40:25 +02:00
parent 574ac7c703
commit f1eaea6b74
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
intranet/modules/mesMachines/main.py
View file

@ -70,6 +70,8 @@ class main(ModuleBase):
machineInfos['mac'] = machine.mac() machineInfos['mac'] = machine.mac()
machineInfos['mid'] = machine.id() machineInfos['mid'] = machine.id()
machineInfos['ip'] = machine.ip() machineInfos['ip'] = machine.ip()
machineInfos['ipv6'] = str(machine.ipv6())
machineInfos['dnsIpv6'] = str(machine.dnsIpv6())
# type # type
if machine.objectClass == 'machineFixe': if machine.objectClass == 'machineFixe':
machineInfos['type'] = 'fixe' machineInfos['type'] = 'fixe'
@ -245,7 +247,10 @@ class main(ModuleBase):
message = m.save() message = m.save()
del m del m
except ValueError, e: except ValueError, e:
try:
del m del m
except:
pass
return {'error':e.args[0].replace("\n","\\n")} return {'error':e.args[0].replace("\n","\\n")}
crans.cp.log("Nouvelle machine %s" % nomNouvelleMachine, "MACHINES") crans.cp.log("Nouvelle machine %s" % nomNouvelleMachine, "MACHINES")
return {'message':u"Machine enregistrée avec succès"} return {'message':u"Machine enregistrée avec succès"}

2
intranet/modules/mesMachines/static/machines.js
View file

@ -125,6 +125,8 @@ Machines.infoPane.display = function(result)
appendChildNodes(basicInfos, createDOM("DT", "type:" ), createDOM("DD",{},"Machine " + result.type ) ); appendChildNodes(basicInfos, createDOM("DT", "type:" ), createDOM("DD",{},"Machine " + result.type ) );
appendChildNodes(basicInfos, createDOM("DT", "mac: " ), createDOM("DD",{},result.mac ) ); appendChildNodes(basicInfos, createDOM("DT", "mac: " ), createDOM("DD",{},result.mac ) );
appendChildNodes(basicInfos, createDOM("DT", "ip: " ), createDOM("DD",{},result.ip ) ); 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) if (result.ipsec)
appendChildNodes(basicInfos, createDOM("DT", "Clef Wifi:" ), createDOM("DD",{},result.ipsec ) ); appendChildNodes(basicInfos, createDOM("DT", "Clef Wifi:" ), createDOM("DD",{},result.ipsec ) );
appendChildNodes( machinePane, basicInfos ); appendChildNodes( machinePane, basicInfos );