From fa43b3fe36ca1821bd94100feb2532e3f8b9dfee Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Thu, 1 Dec 2022 12:39:34 -0600 Subject: [PATCH] Edit User permissions added --- Admin/settings.py | 3 +-- Clientes/views.py | 10 ++++++++-- Templates/Clientes/index.html | 14 ++++---------- Templates/base.html | 2 ++ Templates/base2.html | 3 ++- Templates/sidebar.html | 31 +++++++++++++++++++++++++------ 6 files changed, 42 insertions(+), 21 deletions(-) diff --git a/Admin/settings.py b/Admin/settings.py index cb1fd7b..49a5093 100644 --- a/Admin/settings.py +++ b/Admin/settings.py @@ -18,7 +18,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = 'django-insecure-5*mm&uf5zq@t6nrs_5z8-_qtyapm^3&yz^wqqkc_a!v(!ulj-^' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['*'] @@ -32,7 +32,6 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'allauth', 'allauth.account', diff --git a/Clientes/views.py b/Clientes/views.py index 8804ea2..630584c 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -8,6 +8,8 @@ from django.db.models import Q import datetime from django.views.generic.edit import UpdateView from .forms import ClienteForm +from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import UserPassesTestMixin @login_required def index(request): @@ -126,8 +128,12 @@ def saldo_funct(request): return JsonResponse({'data':Saldo.saldo}) -class ClientesUpdateView(UpdateView): +class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView): model= Clientes form_class=ClienteForm success_url='/' - template_name='Clientes/edit_cliente.html' \ No newline at end of file + template_name='Clientes/edit_cliente.html' + + def test_func(self): + #self.request.user.groups.all() + return self.request.user.groups.filter(name= 'admin_soft') \ No newline at end of file diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 4394084..b5b7056 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -2,20 +2,14 @@ {% extends "base.html" %} - - +{% block title %}Timbres{% endblock title %} + {% block titlePage %} - +Timbres disponibles Comercio Digital: {{saldo.saldo}} {% endblock titlePage %} - {% block content %} -
- - -

Timbres disponibles Comercio Digital: {{saldo.saldo}}

-
@@ -53,7 +47,7 @@ table_rfcc.addEventListener('click',(event)=>{ document.getElementById('rfcc').checked= table_rfcc.checked? true:false; }) - add + diff --git a/Templates/base.html b/Templates/base.html index 7923815..be38f1b 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -10,6 +10,8 @@ + + {% block title %}{% endblock title %} diff --git a/Templates/base2.html b/Templates/base2.html index 5944cb7..4c16978 100644 --- a/Templates/base2.html +++ b/Templates/base2.html @@ -15,8 +15,9 @@ + - {% block title %}{% endblock title %} + {% block title %}AS Admin{% endblock title %} diff --git a/Templates/sidebar.html b/Templates/sidebar.html index ddac99f..cee895c 100644 --- a/Templates/sidebar.html +++ b/Templates/sidebar.html @@ -9,6 +9,7 @@
  • Timbres(current)
    • +{% comment %}
  • Contacts
    • @@ -24,19 +25,37 @@
  • List
    • +
  • + Disabled +
    • +{% endcomment %} + {% if request.user.is_superuser %}
  • Admin site
    • - {% endif %} - -
  • - Disabled -
    • + {% endif %} + {% include "partials/search_form.html" %} +
  • + +
    +
    + {% csrf_token %} + + + +
    + + Another action +
    + Something else here +
    +
    • - {% include "partials/search_form.html" %}