[Cluster-devel] conga ./conga.spec.in.in luci/storage/form-macros

[rmccabe]

CVSROOT:        /cvs/cluster
Module name:    conga
Branch:         RHEL5
Changes by:     [EMAIL PROTECTED]       2007-08-14 18:22:52

Modified files:
        .              : conga.spec.in.in 
        luci/storage   : form-macros 

Log message:
        fix bz250834 (storage name warning utility produces a storm of warnings 
which can lock your browser)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.53&r2=1.45.2.54
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.8&r2=1.17.2.9

--- conga/conga.spec.in.in      2007/08/13 19:06:01     1.45.2.53
+++ conga/conga.spec.in.in      2007/08/14 18:22:51     1.45.2.54
@@ -314,7 +314,8 @@
 - Fixed bz230451 (fence_xvm.key file is not automatically created. Should have 
a least a default)
 - Fixed bz249097 (allow a space as a valid password char)
 - Fixed bz250834 (ZeroDivisionError when attempting to click an empty lvm 
volume group)
-- Resolves: bz249097
+- Fixed bz250443 (storage name warning utility produces a storm of warnings 
which can lock your browser)
+- Resolves: bz249097, bz250443
 - Related: bz230451
 
 * Mon Jul 30 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.0-3
--- conga/luci/storage/form-macros      2007/08/08 22:35:02     1.17.2.8
+++ conga/luci/storage/form-macros      2007/08/14 18:22:51     1.17.2.9
@@ -1068,7 +1068,7 @@
                                  type        string:text; 
                                  value       prop/value;
                                  onkeypress  python:'return 
validate_text_keypress(this, event, 2, \'' + 
prop['validation']['illegal_chars'] + '\', ' + 
str(prop['validation']['max_length']) + ')';
-                                 onblur      python:'validate_text(this, 2, 
\'' + prop['validation']['illegal_chars'] + '\', \'' + 
prop['validation']['reserved_words'] + '\', ' + 
str(prop['validation']['min_length']) + ', ' + 
str(prop['validation']['max_length']) + ', \'' + form_submit_button_id + 
'\')'"/>
+                                 onchange      python:'validate_text(this, 2, 
\'' + prop['validation']['illegal_chars'] + '\', \'' + 
prop['validation']['reserved_words'] + '\', ' + 
str(prop['validation']['min_length']) + ', ' + 
str(prop['validation']['max_length']) + ', \'' + form_submit_button_id + 
'\')'"/>
           
           
           
@@ -1078,7 +1078,7 @@
                                   type   string:text; 
                                   size   string:15; 
                                   value  prop/value;
-                                  onblur python:'validate_int(this, 2, ' + 
str(prop['validation']['min']) + ', ' + str(prop['validation']['max']) + ', ' + 
str(prop['validation']['step']) + ', \'' + prop_units + '\', \'' + 
form_submit_button_id + '\')'"
+                                  onchange python:'validate_int(this, 2, ' + 
str(prop['validation']['min']) + ', ' + str(prop['validation']['max']) + ', ' + 
str(prop['validation']['step']) + ', \'' + prop_units + '\', \'' + 
form_submit_button_id + '\')'"
                   onkeypress="return validate_int_keypress(this, event, 2)"/>
            (<span tal:replace="prop/validation/min"/> - <span 
tal:replace="prop/validation/max"/>)
            <span tal:replace="prop_units"/>
@@ -1096,7 +1096,7 @@
                                    type   string:text;
                                    size   string:15; 
                                    value  value;
-                                   onblur python:'validate_float(this, 2, ' + 
str(minim) + ', ' + str(maxim) + ', ' + str(step) + ', \'' + units + '\', \'' + 
form_submit_button_id + '\')'"
+                                   onchange python:'validate_float(this, 2, ' 
+ str(minim) + ', ' + str(maxim) + ', ' + str(step) + ', \'' + units + '\', \'' 
+ form_submit_button_id + '\')'"
                    onkeypress="return validate_float_keypress(this, event, 
2)"/>
             (<span tal:replace="minim"/> - <span tal:replace="maxim"/>)
             <span tal:replace="units"/>
@@ -1422,9 +1422,15 @@
         return ev.which;
 }
 
+var pending_warning = false;
+
 function display_warning(el, timeout, text)
 {
-    alert(text);
+       if (!pending_warning) {
+               pending_warning = true;
+               alert(text);
+               pending_warning = false;
+       }
     return;
     
     var geom_obj = getGeom(el);