Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

filipecmedeiros
2 parents efee3215 a1394b87
Showing 2 changed files with 36 additions and 20 deletions Show diff stats
core/templates/guest.html
core/views.py
@@ -90,21 +90,6 @@
     		</div>
 		   <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
 				{% block breadcrumbs %}
-
-					<div class="col-md-12">
-						<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-							<div class="input-group">
-							  <div class="form-group is-empty">
-							  <input type="search" class="form-control" placeholder="{% trans 'Search Courses' %}" name="q" id="searchbox"></div>
-							    <span class="input-group-btn input-group-sm">
-							      <button type="button" class="btn btn-fab btn-fab-mini">
-							        <i class="material-icons">search</i>
-							      </button>
-							    </span>
-							</div>
-						</form>
-					</div>
-
 				{% endblock %}
 				{% block render_breadcrumbs %}{% endblock %}
 			<div>
@@ -133,6 +118,27 @@
                             </div>
                         {% endfor %}
                     </div>
+                    <div class="col-md-12">
+                  		<nav aria-label="Page navigation">
+                  			<ul class="pagination">
+                  				{% if page_obj.has_previous %}
+                  				    <li>
+                  				        <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
+                  				    </li>
+                  				{% endif %}
+                  			    {% for page_number in paginator.page_range %}
+                  					<li{% if page_obj.number == page_number %} class="active"{% endif %}>
+                  	    				<a href="?page={{ page_number }}">{{ page_number }}</a>
+                  					</li>
+                  				{% endfor %}
+                  				{% if page_obj.has_next %}
+                  				    <li>
+                  				        <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
+                  				    </li>
+                  				{% endif %}
+                  			</ul>
+                  		</nav>
+                  	</div>
 				{% endblock %}
 			</div>
 		</div>
@@ -14,6 +14,8 @@ from core.mixins import NotificationMixin
 from .models import Notification, Log
 from rolepermissions.shortcuts import assign_role
 from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+
 #API REST IMPORTS
 from .serializers import LogSerializer
 from rest_framework import status, serializers, permissions, viewsets
@@ -103,16 +105,24 @@ class GuestView (ListView):
 	template_name = 'guest.html'
 	context_object_name = 'courses'
+	queryset = CourseCategory.objects.all()
 	paginate_by = 10
-	def get_queryset(self):
-		return Course.objects.filter(public=True)
-
-
 	def get_context_data (self, **kwargs):
 		context = super(GuestView, self).get_context_data(**kwargs)
-		context['categorys_courses'] = CourseCategory.objects.all()
 		context['title'] = _("Guest")
+		queryset_list = CourseCategory.objects.all()
+
+		paginator = Paginator(queryset_list, 10)
+		page = self.request.GET.get('page')
+		try:
+			queryset_list = paginator.page(page)
+		except PageNotAnInteger:
+			queryset_list = paginator.page(1)
+		except EmptyPage:
+			queryset_list = paginator.page(paginator.num_pages)
+
+		context['categorys_courses'] = queryset_list
 		return context