Changeset 6495

Timestamp:

Dec 28, 2008, 10:37:48 PM (16 years ago)

Author:

roland

Message:

Added javascript from Rick to show and hide wireless sub menu when
adding/editing an interface.

I also wrote a wrapper for new_ssid, so that I can pass an interface
object to it too.

Location:

trunk/exodus

Files:

• admin.py (modified) (4 diffs)
• forms.py (modified) (1 diff)
• static/showandhide.js (added)
• wllogic.py (modified) (2 diffs)

trunk/exodus/admin.py

@@ -37 +37 @@
             'fields' : ('ssid', 'channel', 'antenna', 'polar', 'mode')}),
         )
+    class Media:
+        js = ("/static/showandhide.js",)
+        
 
 advanced_admin.register(Antenna)
@@ -44 +47 @@
 advanced_admin.register(Node, NodeAdmin)
 advanced_admin.register(Interface, InterfaceAdmin)
-#advanced_admin.register(PublicAP)
 advanced_admin.register(DhcpStatic)
 
@@ -53 +55 @@
 plain_admin.register(Node)
 plain_admin.register(Interface)
-#plain_admin.register(PublicAP)
 plain_admin.register(DhcpStatic)
 
@@ -62 +63 @@
 databrowse.site.register(Node)
 databrowse.site.register(Interface)
-#databrowse.site.register(PublicAP)
 databrowse.site.register(DhcpStatic)

trunk/exodus/forms.py

@@ -262 +262 @@
     def clean_ssid(self):
         self.type = self.cleaned_data.get('type')
+        edit = bool(self.instance.pk)
         if not link_is_wireless(self):
             return None
-
-
+        if not edit:
+            return new_ssid
+
+        
+
+

trunk/exodus/wllogic.py

@@ -9 +9 @@
 MANAGED = WIFI_MODE_CHOICES[1][0]
 
-def new_ssid(nic):
+def new_ssid_for_save_iface(nic):
+    return new_ssid(nic.node, nic.iface, nic.accesspoint, nic.direction)
+
+def new_ssid(node, iface, accesspoint=False, direction=None):
     """Generates a new ssid name for a new wifi NIC.
     
@@ -16 +19 @@
     """
 
-    node = nic.node.name 
-    network = nic.node.network.name
+    nodename = node.name 
+    network = node.network.name
 
-    if nic.accesspoint: 
+    if accesspoint: 
         ssid_list = set([i.ssid for i in \
-                nic.node.interface_set.filter(accesspoint=True)])
-        ssid = "ap%%d.%s.%s" % ( node, network) 
-        free_list = ( ssid % (i) for i in range(len(ssid_list)+1) if not 
+                node.interface_set.filter(accesspoint=True)])
+        ssid = "ap%%s.%s.%s" % ( nodename, network) 
+    
+        free_list = set()
+        if (ssid % "") not in ssid_list:
+            return (ssid % (""))
+
+                
+        # compensate for the first AP. First AP ssid is: ap.nodename.network
+        # second AP is ap2.nodename.network
+        free_list = ( ssid % (i) for i in range(2, len(ssid_list)+2) if not 
                 (ssid %(i) in ssid_list))
         return free_list.next()
 
     else:
-            return "il-%s.%s.%s.%s" % (nic.direction, nic.iface, node, network)
-
+        ssid = "%%S.%s.%s" % (nodename, network)
+        if direction:
+            return ssid % (direction)
+        else: 
+            return ssid % (iface)
+            
 #
 # Taken from lvoege@gmail.com's getrange.py