panel de administracion

administration/templates/aside.html

+<div class="form-group">
+    <br>
+    <ul class="sidebar-menu" data-widget="tree">
+        <li>
+            <a class="treeview " href="{{ BASE_URL }}/catalog">
+                <i class="fa fa-map"></i>
+                <span>Home</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li>
+        <li>
+            <a class="treeview " href="../../administration/request">
+                <i class="fa fa-user-plus"></i>
+                <span>Request</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li> 
+        <li>
+            <a class="treeview " href="../../administration/users">
+                <i class="fa fa-users"></i>
+                <span>Active users</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li>
+    </ul>
+</div>
\ No newline at end of file

administration/templates/dashboard.html

@@ -106,21 +106,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="form-group">
-        <br>
-        <ul class="sidebar-menu" data-widget="tree">
-            <li>
-                <a class="treeview " href="{{ BASE_URL }}/catalog">
-                    <i class="fa fa-map"></i>
-                    <span>Home</span>
-                    <span class="pull-right-container">
-              <span class="label label-primary pull-right"></span>
-            </span>
-                </a>
-            </li>
-        </ul>
-    </div>
-    <!-- form-group-->
+    {% include 'aside.html' %}
 {% endblock %}
 
 {% block user %}
@@ -135,51 +121,7 @@
             <div class="panel panel-default">
                 <div class="panel-heading">{{ Viewname }}</div>
                 <div class="panel-body text-center">
-                    <table data-toggle="table" id="example" class="table table-striped table-bordered"
-                           style="width:100%">
-                        <thead>
-                        <th>Username</th>
-                        <th>First Name</th>
-                        <th>Last Name</th>
-                        <th>E-mail</th>
-                        <th>Active</th>
-                        <th>Staff</th>
-                        <th>Super</th>
-                        <th>Actions</th>
-                        </thead>
-                        <tbody>
-                        {% for user in users %}
-                            <tr>
-                                <td>{{ user.username }}</td>
-                                <td>{{ user.first_name }}</td>
-                                <td>{{ user.last_name }}</td>
-                                <td>{{ user.email }}</td>
-                            <form method="post" action="update/">
-
-                                {% csrf_token %}
-                                <input type="hidden" name="user_id" value="{{ user.user_id }}">
-                                <td>
-                                    <input type="checkbox" name="is_active" value="1"
-                                           {% if user.status == True %}checked{% endif %}>
 
-                                </td>
-                                <td>
-                                    <input type="checkbox" name="is_staff" value="1"
-                                           {% if user.staff == True %}checked{% endif %}>
-                                </td>
-                                <td>
-                                    <input type="checkbox" name="is_superuser" value="1"
-                                           {% if user.superuser == True %}checked{% endif %}>
-                                </td>
-                                <td>
-                                    <button type="submit" class="btn btn-success"><i class="fa fa-save"></i></button>
-                                    <a href="#" class="btn btn-danger"><i class="fa fa-trash"></i></a>
-                                </td>
-                            </form>
-                            </tr> 
-                        {% endfor %}
-                        </tbody>
-                    </table>
                 </div>
             </div>
         </section>

administration/templates/users_table.html

@@ -106,20 +106,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="form-group">
-        <br>
-        <ul class="sidebar-menu" data-widget="tree">
-            <li>
-                <a class="treeview " href="{{ BASE_URL }}/catalog">
-                    <i class="fa fa-map"></i>
-                    <span>Home</span>
-                    <span class="pull-right-container">
-              <span class="label label-primary pull-right"></span>
-            </span>
-                </a>
-            </li>
-        </ul>
-    </div>
+    {%  include 'aside.html' %}
     <!-- form-group-->
 {% endblock %}
 
@@ -154,9 +141,10 @@
                                 <td>{{ user.first_name }}</td>
                                 <td>{{ user.last_name }}</td>
                                 <td>{{ user.email }}</td>
-                            <form method="post" action="update/">
+                            <form method="post" action="../update/">
 
                                 {% csrf_token %}
+                                <input type="hidden" name="request_path" value="{{ request.path }}">
                                 <input type="hidden" name="user_id" value="{{ user.user_id }}">
                                 <td>
                                     <input type="checkbox" name="is_active" value="1"

administration/urls.py

@@ -3,6 +3,8 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.Request_users, name='Dashboard'),
+    url(r'^$', views.Dashboard, name='Dashboard'),
+    url(r'^request/$', views.Request_users, name='Request'),
     url(r'^update/$', views.update_user, name='update'),
+    url(r'^users/$', views.active_users, name='users'),
 ]
\ No newline at end of file

administration/views.py

@@ -2,11 +2,17 @@ from django.contrib import messages
 from django.contrib.auth.models import User
 from django.shortcuts import render, redirect
 import json
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, HttpRequest
 from PIL import Image
 
+
 # Create your views here.
-def Request_users (request):
+def Dashboard(request):
+    return render(request, 'dashboard.html', {"Viewname": "Dashboard"})
+
+
+# ----------------------------------------------------------
+def Request_users(request):
     if request.user.is_superuser or request.user.is_staff:
         user_list = []
         for user in User.objects.filter(is_active=False):
@@ -20,11 +26,13 @@ def Request_users (request):
                 "staff": user.is_staff,
                 "superuser": user.is_superuser,
             })
-        #messages.success(request, 'your registration is being processed')
-        return render(request,'users_table.html',{'users': user_list, "Viewname" : "Request"})
+        # messages.success(request, 'your registration is being processed')
+        return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})
     else:
         return redirect('../')
-#------------------------------------------------------------------------
+
+
+# ------------------------------------------------------------------------
 def update_user(request):
     is_active = False
     is_staff = False
@@ -44,6 +52,23 @@ def update_user(request):
     user.save()
 
     messages.success(request, 'the user was updated')
-    return HttpResponseRedirect('../')
+
+    return redirect(request.POST.get('request_path'))
+
+
 def active_users(request):
-    pass
\ No newline at end of file
+    if request.user.is_superuser or request.user.is_staff:
+        user_list = []
+        for user in User.objects.filter(is_active=True):
+            user_list.append({
+                "user_id": user.id,
+                "username": user.username,
+                "first_name": user.first_name,
+                "last_name": user.last_name,
+                "email": user.email,
+                "status": user.is_active,
+                "staff": user.is_staff,
+                "superuser": user.is_superuser,
+            })
+        # messages.success(request, 'your registration is being processed')
+        return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})

catalog/views.py

@@ -646,7 +646,7 @@ def IPN(request):
 #         pass
 #     else:
 #         pass
-#     return redirect("https://google.com.mx") 
+#     return redirect("https://google.com.mx")
 # ------------------------------------------------------
 def Registration(request):
     #user = User.objects.filter(email=request.POST['email'])