Changeset 6446

Timestamp:

11/16/10 19:48:02 (3 years ago)

Author:

jow

Message:

libs/web: add range(min,max) datatype validator

Location:

luci/trunk/libs/web

Files:

• htdocs/luci-static/resources/cbi.js (modified) (3 diffs)
• luasrc/cbi.lua (modified) (1 diff)
• luasrc/cbi/datatypes.lua (modified) (1 diff)

luci/trunk/libs/web/htdocs/luci-static/resources/cbi.js

@@ -156 +156 @@
     {
         return (v.match(/^[a-zA-Z0-9_]+$/) != null);
+    },
+
+    'range': function(v, args)
+    {
+        var min = parseInt(args[0]);
+        var max = parseInt(args[1]);
+        var val = parseInt(v);
+
+        if (!isNaN(min) && !isNaN(max) && !isNaN(val))
+            return ((val >= min) && (val <= max));
+
+        return false;
     }
 };
@@ -635 +647 @@
 {
     var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid;
+    var vargs;
+
+    if( type.match(/^(\w+)\(([^\(\)]+)\)/) )
+    {
+        type  = RegExp.$1;
+        vargs = RegExp.$2.split(/\s*,\s*/);
+    }
+
     var vldcb = cbi_validators[type];
 
@@ -650 +670 @@
                     ? field.options[field.options.selectedIndex].value : field.value;
 
-                if( !(((value.length == 0) && optional) || vldcb(value)) )
+                if( !(((value.length == 0) && optional) || vldcb(value, vargs)) )
                 {
                     // invalid

luci/trunk/libs/web/luasrc/cbi.lua

@@ -1359 +1359 @@
 -- Validate the form value
 function AbstractValue.validate(self, value)
-    if self.datatype and value and datatypes[self.datatype] then
-        if type(value) == "table" then
-            local v
-            for _, v in ipairs(value) do
-                if v and #v > 0 and not datatypes[self.datatype](v) then
+    if self.datatype and value then
+        local args = { }
+        local dt, ar = self.datatype:match("^(%w+)%(([^%(%)]+)%)")
+
+        if dt and ar then
+            local a
+            for a in ar:gmatch("[^%s,]+") do
+                args[#args+1] = a
+            end
+        else
+            dt = self.datatype
+        end
+
+        if dt and datatypes[dt] then
+            if type(value) == "table" then
+                local v
+                for _, v in ipairs(value) do
+                    if v and #v > 0 and not datatypes[dt](v, unpack(args)) then
+                        return nil
+                    end
+                end
+            else
+                if not datatypes[dt](value, unpack(args)) then
                     return nil
                 end
             end
-        else
-            if not datatypes[self.datatype](value) then
-                return nil
-            end
-        end
-    end
+        end
+    end
+
     return value
 end

luci/trunk/libs/web/luasrc/cbi/datatypes.lua

@@ -209 +209 @@
     return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
 end
+
+function range(val, min, max)
+    val = tonumber(val)
+    min = tonumber(min)
+    max = tonumber(max)
+
+    if val ~= nil and min ~= nil and max ~= nil then
+        return ((val >= min) and (val <= max))
+    end
+
+    return false
+end