Issue #14: validate router name

handle router name length
freifunk-berlin · Nov 10, 2015 · ec884bd · ec884bd
1 parent 897880d
commit ec884bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/index.html b/src/index.html
@@ -76,7 +76,9 @@ <h2>
                 name="routerName"
                 placeholder="{{'basicRouterSetup.routerName.placeholder' | translate }}"
                 data-ng-model="wizard.router.name"
-                required pattern="[A-Za-z0-9_\-]{0,16}"
+                required pattern="[A-Za-z0-9_\-]*"
+                data-ng-minlength="3"
+                data-ng-maxlength="32"
                 >
               <span class="fa form-control-feedback"
                 ng-class="formControlFeedback('routerName')"></span>
@@ -91,11 +93,15 @@ <h2>
                 <div ng-show="wizardForm.routerName.$error.required" translate>
                   .routerName.error.required
                 </div>
-              </div>
-              <div class="help-block" ng-show="hasError('routerName')">
                 <div ng-show="wizardForm.routerName.$error.pattern" translate>
                   .routerName.error.pattern
                 </div>
+                <div ng-show="wizardForm.routerName.$error.maxlength" translate>
+                  .routerName.error.maxLength
+                </div>
+                <div ng-show="wizardForm.routerName.$error.minlength" translate>
+                  .routerName.error.minLength
+                </div>
               </div>
             </div>
           </div>

diff --git a/src/nls/locale-en.json b/src/nls/locale-en.json
@@ -7,7 +7,9 @@
       "label": "Router name",
       "error": {
         "required": "This field is required.",
-        "pattern":"Special Characters are not allowed."
+        "pattern": "Special Characters are not allowed.",
+        "maxLength": "Max Characters 36",
+        "minLength": "Min Characters 3"
       },
       "help": "The router name is needed for ip registration and VPN cert and key generation. Also this name is visible in the <a href=\"http://map.berlin.freifunk.net\">Freifunk map</a> if you decide to share your location.",
       "placeholder": "example: funkenpumpe3000"