properly implementing minimum lenght limit in search

kakwa · Jul 6, 2016 · baee15c · baee15c
1 parent 3b6cf61
commit baee15c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ldapcherry/__init__.py b/ldapcherry/__init__.py
@@ -890,7 +890,7 @@ def searchuser(self, searchstring=None):
         """ search user page """
         self._check_auth(must_admin=False)
         is_admin = self._check_admin()
-        if searchstring is not None:
+        if searchstring is not None and len(searchstring) > 2:
             res = self._search(searchstring)
         else:
             res = None
@@ -927,7 +927,7 @@ def searchadmin(self, searchstring=None):
         """ search user page """
         self._check_auth(must_admin=True)
         is_admin = self._check_admin()
-        if searchstring is not None:
+        if searchstring is not None and len(searchstring) > 2:
             res = self._search(searchstring)
         else:
             res = None

diff --git a/resources/templates/navbar.tmpl b/resources/templates/navbar.tmpl
@@ -17,7 +17,7 @@
                     <a class="navbar-brand navbar-right" href='/logout'><span class="glyphicon glyphicon-off"></span> Logout</a>
 		            <form method='GET' action='/searchuser' class="navbar-form navbar-right" role="search" data-toggle="validator">
                         <div class="form-group">
-                            <input type="text" class="form-control" data-minlength="3" name="searchstring" placeholder="Search User" data-error="Too short">
+                            <input type="text" class="form-control" data-minlength="3" name="searchstring" placeholder="Search User" data-error="Too short" required>
                         </div>
                         <button type="submit" class="btn btn-default">Submit</button>
                     </form>

diff --git a/resources/templates/searchadmin.tmpl b/resources/templates/searchadmin.tmpl
@@ -6,7 +6,7 @@
             <form method='get' action='/searchadmin' role="form" class="form-inline" data-toggle="validator">
                 <div class="form-group">
                      <label for="searchstring">Search user to modify/delete</label>
-                     <input type="text" class="form-control" data-minlength="3" data-error="Too short" id="searchstring" name="searchstring" placeholder="Search User">
+                     <input type="text" class="form-control" data-minlength="3" data-error="Too short" id="searchstring" name="searchstring" placeholder="Search User" required>
                 </div>
                 <div class="form-group">
                     <label for="submit">Submit</label>

diff --git a/resources/templates/searchuser.tmpl b/resources/templates/searchuser.tmpl
@@ -6,7 +6,7 @@
             <form method='get' action='/searchuser' role="form" class="form-inline" data-toggle="validator">
                 <div class="form-group">
                      <label for="searchstring">Search user</label>
-                     <input type="text" id="searchstring" data-minlength="3" data-error="Too short" class="form-control" name="searchstring" placeholder="Search User">
+                     <input type="text" id="searchstring" data-minlength="3" data-error="Too short" class="form-control" name="searchstring" placeholder="Search User" required>
                 </div>
                 <div class="form-group">
                     <label for="submit">Submit</label>