Commit 55aba3d7 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Make Abide validation for Searh input

parent 8c8260a2

sopds_web_backend/templates/sopds_error.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{% extends "sopds_main.html" %}



{% block body %}

{% if errormsg %}

<div class="callout small alert">

  <p>{{ errormsg }}</p>

</div>

{% endif %}		



{% endblock %}  {# body #}
 
 No newline at end of file

sopds_web_backend/templates/sopds_logo.html

+6 −6
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
  <div class="show-for-medium medium-4 large-3 column" style="padding:0rem 0rem 0rem 1rem;"><img src="{% static "images/sopds_logo.gif" %}"></div>



  <div class="small-12 medium-8 large-9 column" style="padding:0.2rem 1rem 0 1rem;">

  <form method="get" action="/web/search/books/" id="searchform">

  <form method="get" action="/web/search/books/" id="searchform" data-abide>

  {% csrf_token %}

    <div class="input-group">

    

		<input class="input-group-field" type="search" name="searchterms" placeholder="Search" id="main_searchbox">

		<input class="input-group-field" type="search" name="searchterms" placeholder="Search" id="main_searchbox" data-validator="check_len3" required>



		<div class="input-group-button">

		      <button class="button" type="submit" data-close="search-dropdown" name="submit">Search</button>
@@ -20,7 +20,6 @@ 
		<input type="hidden" name="page" value="0">		

	</div>





	<div class="dropdown-pane bottom" id="search-dropdown" data-dropdown>

	  <div class="row">

	  <fieldset class="large-12 columns">
@@ -47,3 +46,4 @@ 
	         $('#search-dropdown').foundation('close');         

	}	   

  </script>

  
 No newline at end of file

sopds_web_backend/templates/sopds_main.html

+7 −1
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ 
  <script>

    $(document).foundation();   	

    SetSearch();   

	Foundation.Abide.defaults.validators['check_len3'] = 

		function($el,required,parent) {

		     if ($el[0].value.length < 3)          

		            return false;

		     return true;

	  	};    

  </script>



 {% block block-js %}{% endblock %}

sopds_web_backend/views.py

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ def SearchBooksView(request): 
        #searchterms0 = int(request.POST.get('searchterms0', ''))

        page_num = int(request.GET.get('page', '1'))

        

        if len(searchterms)<3:

            args['errormsg'] = 'Too few symbols in search string !';

            return render_to_response('sopds_error.html', args)

        

        books = Book.objects.extra(where=["upper(title) like %s"], params=["%%%s%%"%searchterms.upper()])

        

        if len(books)>0: