- Implementazione nuove funzionalità

diff --git a/sistema/static/assets/css/custom.css b/sistema/static/assets/css/custom.css
index 07ae23498ac0bacf28aa58375e278d01361366c9..76dc3e53a47dd33b12ea77d9202a7fe108baac45 100755 (executable)
--- a/sistema/static/assets/css/custom.css
+++ b/sistema/static/assets/css/custom.css
@@ -1075,3 +1075,28 @@ table#tab-ins-costi-tratta td .form-control {
 .dropdown-menu[data-bs-popper] {
     left: auto;
 }
+
+
+
+/* (A) LIST STYLES */
+.slist {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+.slist li {
+  margin: 10px;
+  padding: 15px;
+  border: 1px solid #dfdfdf;
+  background: #f5f5f5;
+}
+
+/* (B) DRAG-AND-DROP HINT */
+.slist li.hint {
+  border: 1px solid #ffc49a;
+  background: #feffb4;
+}
+.slist li.active {
+  border: 1px solid #ffa5a5;
+  background: #ffe7e7;
+}

diff --git a/sistema/templates/base.html b/sistema/templates/base.html
index 43d0da30cdb059980613ec5d911d12c086f56eef..66f806cedabdd69bff41bdddd525a9e07c4fd10b 100644 (file)
--- a/sistema/templates/base.html
+++ b/sistema/templates/base.html
@@ -16,9 +16,6 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
 
     <!-- CSS only -->
-
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet"/>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
     <script src="https://kit.fontawesome.com/aada406570.js" crossorigin="anonymous"></script>
@@ -56,28 +53,7 @@
             crossorigin="anonymous"></script>
 
     <style>
-        /* (A) LIST STYLES */
-        .slist {
-          list-style: none;
-          padding: 0;
-          margin: 0;
-        }
-        .slist li {
-          margin: 10px;
-          padding: 15px;
-          border: 1px solid #dfdfdf;
-          background: #f5f5f5;
-        }
-
-        /* (B) DRAG-AND-DROP HINT */
-        .slist li.hint {
-          border: 1px solid #ffc49a;
-          background: #feffb4;
-        }
-        .slist li.active {
-          border: 1px solid #ffa5a5;
-          background: #ffe7e7;
-        }
+
     </style>
 
 </head>
@@ -236,14 +212,6 @@
     <link rel="stylesheet" href="{% static 'assets/css/notifications/Lobibox.min.css' %}">
     <script src="{% static 'assets/js/notifications/Lobibox.js' %}"></script>
 
-    <!-- Stampa -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"
-            integrity="sha512-GsLlZN/3F2ErC5ifS5QtgpiJtWd43JWSuIgh7mbzZ8zBps+dvLusV+eNQATqgA/HdeKFVgA5v3S/cIrLF7QnIg=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js"></script>
-
-<script src="https://rawgit.com/Microsoft/TypeScript/master/lib/typescriptServices.js"></script>
-<script src="https://rawgit.com/basarat/typescript-script/master/transpiler.js"></script>
 </div>
 
 

diff --git a/sistema/views.py b/sistema/views.py
index ccd16b70e6e0e90677d929ef3b83f0bade30bea3..f05a09a53f43b8ac7a6edfb0266da37302099515 100644 (file)
--- a/sistema/views.py
+++ b/sistema/views.py
@@ -1,6 +1,7 @@
 import json
 
 from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import JsonResponse
 from django.shortcuts import render, redirect
 from django.urls import reverse
@@ -10,9 +11,7 @@ from rest_framework import status
 
 from sistema.forms import LocalitaForm, TipoMultimediaForm, PoiForm, PercorsoForm, MultimediaForm
 from sistema.models import Localita, TipologiaMultimedia, PointOfInterest, Percorso, Tappa, TappaSerializer, Multimedia
-from socoin_atlas import settings
 from utenti.mixins import CustomLoginRequiredMixin
-from django.template.defaultfilters import register
 
 
 class LocalitaListView(TemplateView):#PermissionRequiredMixin
@@ -43,7 +42,7 @@ class PercorsiListView(TemplateView):
     template_name = 'percorsi_list.html'
 
 
-class Home(View):  # CustomLoginRequiredMixin
+class Home(CustomLoginRequiredMixin, View):  # CustomLoginRequiredMixin
     def get(self, request):
         return render(request, 'home.html', {})
 

diff --git a/utenti/mixins.py b/utenti/mixins.py
index 7500a35210819edea171d0b2607a12b9c1df262c..2627bd461122fd3ad7ceec177b9dd6927ff1f184 100644 (file)
--- a/utenti/mixins.py
+++ b/utenti/mixins.py
@@ -8,7 +8,7 @@ from rest_framework.views import APIView
 
 
 class CustomLoginRequiredMixin(LoginRequiredMixin, View):
-    login_url = reverse_lazy('login')
+    login_url = reverse_lazy('utenti:login')
     redirect_field_name = 'redirect_to'
 
 
@@ -23,7 +23,7 @@ class AuthorizationRequiredMixin(object):
         if request.user.is_authenticated:
             return super(AuthorizationRequiredMixin, self).dispatch(request, *args, **kwargs)
         else:
-            return redirect('/login/')
+            return redirect('utenti:login')
 
 
 class PermissionRequiredMixin(object):
@@ -34,9 +34,9 @@ class PermissionRequiredMixin(object):
             user_perms = request.session.get('roles')
             if user_perms:
                 if len(set(user_perms).intersection(self.permission_required)) <= 0:
-                    return redirect('/login/')
+                    return redirect('utenti:login')
                 return super(PermissionRequiredMixin, self).dispatch(request, *args, **kwargs)
             else:
-                return redirect('/login/')
+                return redirect('utenti:login')
         else:
-            return redirect('/login/')
\ No newline at end of file
+            return redirect('utenti:login')
\ No newline at end of file

diff --git a/utenti/views.py b/utenti/views.py
index 26637a8c0fa6edf5256b995a29e75386828a6148..a5cb568ba6cfc0635b3906cc706c57ede008b62a 100644 (file)
--- a/utenti/views.py
+++ b/utenti/views.py
@@ -1,6 +1,4 @@
 import json
-
-from django.contrib.auth import authenticate, login
 from django.contrib.auth.models import User
 from django.http import JsonResponse
 from django.shortcuts import render, redirect
@@ -18,7 +16,7 @@ from utenti.forms import FormLogin, RegistrationForm, TourOperatorNewForm, Custo
 
 class Autentication(View):
     def post(self, request):
-        redirect_to = request.GET.get('redirect_to', '/')
+        redirect_to = request.GET.get('redirect_to', '/sistema/home/')
         if request.user.is_authenticated:
             return redirect(redirect_to)
 
@@ -27,13 +25,13 @@ class Autentication(View):
 
         user = authenticate(username=username, password=password)
         if user is not None:
-            login(request, user, backend='accounts.backends.AuthenticationLoginBackend')
+            login(request, user)
             messages.add_message(request, messages.INFO, 'Ciao ' + username + ' :)')
 
             request.session['roles'] = user.groups.all()[0].name
             request.session['user_id'] = user.pk
             request.session['username'] = user.username
-            return redirect('sistema:home')
+            return redirect('/')
 
         else:
             messages.add_message(request, messages.ERROR, 'Dati di autenticazione non validi.')