[schema] Improved ordering and titles of wireless properties

openwisp · Mar 21, 2016 · c8c95d6 · c8c95d6
1 parent 526c2d1
commit c8c95d6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/netjsonconfig/backends/openwrt/schema.py b/netjsonconfig/backends/openwrt/schema.py
@@ -75,7 +75,7 @@
                                 "type": "string",
                                 "$ref": "#/definitions/interface_settings/properties/network"
                             },
-                            "propertyOrder": 10
+                            "propertyOrder": 19
                         }
                     }
                 }

diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -276,31 +276,34 @@
                 "mode",
             ],
             "properties": {
-                "radio": {
+                "mode": {
                     "type": "string",
-                    "minLength": 2,
                     "propertyOrder": 1,
                 },
-                "mode": {
+                "radio": {
                     "type": "string",
+                    "minLength": 2,
                     "propertyOrder": 2,
                 },
                 "ack_distance": {
                     "type": "integer",
+                    "title": "ACK distance",
                     "minimum": 1,
-                    "propertyOrder": 7,
+                    "propertyOrder": 10,
                 },
                 "rts_threshold": {
                     "type": "integer",
+                    "title": "RTS threshold",
                     "minimum": 0,
                     "maximum": 2346,
-                    "propertyOrder": 8,
+                    "propertyOrder": 11,
                 },
                 "frag_threshold": {
                     "type": "integer",
+                    "title": "fragmentation threshold",
                     "minimum": 0,
                     "maximum": 2346,
-                    "propertyOrder": 9,
+                    "propertyOrder": 12,
                 }
             }
         },
@@ -310,8 +313,9 @@
             "properties": {
                 "ssid": {
                     "type": "string",
+                    "title": "SSID",
                     "maxLength": 32,
-                    "propertyOrder": 4,
+                    "propertyOrder": 3,
                 }
             }
         },
@@ -320,9 +324,10 @@
             "properties": {
                 "hidden": {
                     "type": "boolean",
+                    "title": "hide SSID",
                     "default": False,
                     "format": "checkbox",
-                    "propertyOrder": 5,
+                    "propertyOrder": 4,
                 }
             }
         },
@@ -332,9 +337,10 @@
             "properties": {
                 "bssid": {
                     "type": "string",
-                    "propertyOrder": 6,
+                    "title": "BSSID",
                     "minLength": 17,
                     "maxLength": 17,
+                    "propertyOrder": 4,
                 },
             }
         },
@@ -346,7 +352,7 @@
                     "type": "boolean",
                     "default": False,
                     "format": "checkbox",
-                    "propertyOrder": 3,
+                    "propertyOrder": 5,
                 }
             }
         },
@@ -356,7 +362,7 @@
             "properties": {
                 "mesh_id": {
                     "type": "string",
-                    "title": "mesh id",
+                    "title": "mesh ID",
                     "pattern": "^[^\\s]*$",
                     "propertyOrder": 3,
                 },