WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/branches/dpurdie/images/common.js

      if (restore) selObj.selectedIndex=0;
+  }
+}
 function MM_validateForm() { //v5.0
-   var i,p,pl,q,nm,test,num,min,max,errors='',args=MM_validateForm.arguments;
+   var ii,p,pl,q,nm,test,num,min,max,errors='',args=MM_validateForm.arguments;
    var REresults;
    var pass,passc;
    // Other general validations
    var cleanStrRE = /^[0-9a-z_\.\(\)\-]+$/i;
    var pkgRE = /^[a-z][a-z0-9_-]*[a-z0-9]$/i;
    var versionRE = /^[0-9a-z_\.\(\)\-]+$/i;
    var versionNumberRE = /^\d+\.\d+\.\d+$/;
    var urlRE = "^https?://[a-z1-9]";
    //character range disallowed
    var HTMLchr = /[\<\>\'\"]+/i;
    var alphanumRE = /^[a-z0-9]+$/i;
-   for (i=0; i<(args.length-2); i+=3) {
+   for (ii=0; ii<(args.length-2); ii+=3) {
-      test=args[i+2];
+      test=args[ii+2];
-      val=MM_findObj(args[i]);
+      val=MM_findObj(args[ii]);
       if (val) {
-         nm=args[i+1];
+         nm=args[ii+1];
          val=val.value;
          if (val!="") {
+               }
+            }
             if (test.indexOf('isPackage')!=-1) {
                REresults = val.search(pkgRE);
-               if (REresults < 0) errors += val += ' - '+nm+' is not valid. Valid characters are A-Z a-z 0-9 - _\n'
+               if (REresults < 0) errors += val + ' - '+nm+' is not valid. Valid characters are A-Z a-z 0-9 - _\n'
                         + 'Names must start with a letter and cannot contain spaces or symbols other than - and _\n';
+            }
             if (test.indexOf('isCleanStr')!=-1) {
                REresults = val.search(cleanStrRE);
-               if (REresults < 0) errors += val += '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+               if (REresults < 0) errors += val + '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+            }
             if (test.indexOf('isVersionStr')!=-1) {
                REresults = val.search(versionRE);
-               if (REresults < 0) errors += val += '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+               if (REresults < 0) errors += val + '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+            }
             if (test.indexOf('isPatchVersionStr')!=-1) {
                if ( !re_patch_ver_format.test(val) ) {
-                  errors += val += '- '+nm+' is not of form (integer).(integer).(integer).p(integer).(extension)\n';
+                  errors += val + '- '+nm+' is not of form (integer).(integer).(integer).p(integer).(extension)\n';
+               }
+            }
             if (test.indexOf('isCCPath')!=-1) {
                var CCPathRE = /^\\|\/[a-z]+[0-9a-z_\.\-\\\/ ]+$/i;
                REresults = val.search(CCPathRE);
-               if (REresults < 0) errors += val += '- '+nm+' uses invalid character.\nAllowed characters are \\ / A-Z a-z 0-9 . - _ SPACE\nAnd the path must begin with \\ or /';
+               if (REresults < 0) errors += val + '- '+nm+' uses invalid character.\nAllowed characters are \\ / A-Z a-z 0-9 . - _ SPACE\nAnd the path must begin with \\ or /';
+            }
             if (test.indexOf('isCCLabel')!=-1) {
                var CCLabelRE = /^[0-9a-z_\.\-]+$/i;
                REresults = val.search(CCLabelRE);
-               if (REresults < 0) errors += val += '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+               if (REresults < 0) errors += val + '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+            }
             if (test.indexOf('isSVNTag')!=-1) {
                 // Subversion Tag validation
                 var SVNTagValidPeg = /^@?\d+$/;
                 var SVNTagRE = /^[0-9a-z_\.\-]+$/i;
                if ( val.search(SVNTagValidPeg) < 0) {
-                    val = val.replace (/@\d+$/,"");
+                    var stripped;
+                    stripped = val.replace (/@\d+$/,"");
-               if (val.search(SVNTagRE) < 0)
+                    if (stripped.search(SVNTagRE) < 0)
-                    errors += val += '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+                        errors += val + '- '+nm+' uses invalid character. Allowed characters are A-Z a-z 0-9 . - _\n';
+               }
+            }
+            if (test.indexOf('isSVNPegTag')!=-1 && ! errors) {
+                // Subversion Tag has peg - Must have done valid check first
+                var SVNTagPegged = /@?\d+$/;
+                if ( val.search(SVNTagPegged) < 0) {
+                    errors += val + '- '+nm+' Must be pegged for Manually Versioned Package\n';
+               }
+            }
             if (test.indexOf('isSVNPath')!=-1) {
                // Subversion Base Path validation
                var SVNTagInValidSlash = /^.*\/\/.*$/i;
                var SVNTagInValidTrunkAnywhereRE = /\/trunk\//i;
                var SVNTagValidTagAnywhereRE = /^.*\/tags\/.*$/i;
                if (val.search(SVNTagValidCharsRE) < 0)
-                  errors += val += ' - '+nm+' uses invalid character. Allowed characters are / A-Z a-z 0-9 . - _\n';
+                  errors += val + ' - '+nm+' uses invalid character. Allowed characters are / A-Z a-z 0-9 . - _\n';
                else if (val.search(SVNTagInValidSlashAtBOL) >= 0)
-                  errors += val += ' - '+nm+' begins with a /. This is not allowed.\n';
+                  errors += val + ' - '+nm+' begins with a /. This is not allowed.\n';
                else if (val.search(SVNTagInValidSlashAtEOL) >= 0)
-                  errors += val += ' - '+nm+' ends with a /. This is not allowed.\n';
+                  errors += val + ' - '+nm+' ends with a /. This is not allowed.\n';
                else if (val.search(SVNTagInValidSlash) >= 0)
-                  errors += val += ' - '+nm+' uses //. This is not allowed.\n';
+                  errors += val + ' - '+nm+' uses //. This is not allowed.\n';
                else if (val.search(SVNTagValidTagAnywhereRE) >= 0)
-                     errors += val += ' - '+nm+' contains /tags/. This is not allowed.\n';
+                     errors += val + ' - '+nm+' contains /tags/. This is not allowed.\n';
                else if (val.search(SVNTagInValidTrunkAnywhereRE) >= 0)
-                     errors += val += ' - '+nm+' contains /trunk/. This is not allowed.\n';
+                     errors += val + ' - '+nm+' contains /trunk/. This is not allowed.\n';
                else {
                         var bits = val.split("/");
                         if ( bits.length < 4 )
-                            errors += val += ' - Must contain at least 4 path items.\n';
+                            errors += val + ' - Must contain at least 4 path items.\n';
                         var ttbcount = 0;
+                        var i
                         for (i=0; i < bits.length; i++ )
+                        {
                             var el = bits[i];
                             if ( el == 'tags') ttbcount++;
                             if ( el == 'trunk') ttbcount++;
                             if ( el == 'branches') ttbcount++;
+                        }
                         if ( ttbcount != 1 )
-                            errors += val += ' - '+nm+' must contain exactly one of tags, trunk or branches. It contains '+ttbcount+'.\n';
+                            errors += val + ' - '+nm+' must contain exactly one of tags, trunk or branches. It contains '+ttbcount+'.\n';
                         if ( bits.pop() == 'branches' )
-                            errors += val += ' - '+nm+' must not end in branches.\n';
+                            errors += val + ' - '+nm+' must not end in branches.\n';
+                     }
+            }
             if (test.indexOf('isVersionNumber')!=-1) {
                REresults = val.search(versionNumberRE);
-               if (REresults < 0) errors += val += ' - '+nm+' is formatted incorrectly.\nVersion number should be (major).(minor).(patch)(build)\ne.g. 1.0.2002\n';
+               if (REresults < 0) errors += val + ' - '+nm+' is formatted incorrectly.\nVersion number should be (major).(minor).(patch)(build)\ne.g. 1.0.2002\n';
+            }
             if (test.indexOf('isURL')!=-1) {
                REresults = val.match(urlRE);
                if (REresults == null) errors += '"'+val+'" is not a valid URL.\n';

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/branches/dpurdie/images/common.js – Rev 1339 → 1372