From: Alberto Monda Date: Fri, 31 Jan 2025 14:52:53 +0000 (+0100) Subject: Commit risoluzione bug 31/01/2025 X-Git-Url: https://git.atlas4tour.it/?a=commitdiff_plain;h=96fe1b196c8315b1d7e1f08779840d6559f48a5b;p=pia_atlas.git Commit risoluzione bug 31/01/2025 --- diff --git a/sistema/datatables.py b/sistema/datatables.py index d474a5a..4efd401 100644 --- a/sistema/datatables.py +++ b/sistema/datatables.py @@ -5,7 +5,6 @@ from django.db.models import Q from sistema.models import Localita, Multimedia, TipologiaMultimedia, Percorso, PointOfInterest, Feedback, Gestisce from socoin_atlas.settings import MEDIA_URL - class LocalitaDatatables(BaseDatatableView): model = Localita columns = ['id', 'descrizione', 'provincia', 'cap', 'regione', 'mod', 'del'] diff --git a/sistema/forms.py b/sistema/forms.py index a43e66c..1ab435d 100644 --- a/sistema/forms.py +++ b/sistema/forms.py @@ -4,7 +4,6 @@ from django.contrib.auth.forms import * from sistema.models import Localita, TipologiaMultimedia, Gestisce, PointOfInterest, Percorso, Multimedia from socoin_atlas.settings import MEDIA_URL - class LocalitaForm(forms.ModelForm): class Meta: model = Localita diff --git a/sistema/models.py b/sistema/models.py index 0990557..70553ea 100644 --- a/sistema/models.py +++ b/sistema/models.py @@ -55,7 +55,6 @@ class Pagamenti(models.Model): percorso = models.ForeignKey(Percorso, on_delete=models.CASCADE) data_acquisto = models.DateTimeField(auto_now_add=True) - class Tappa(models.Model): percorso = models.ForeignKey(Percorso, on_delete=models.DO_NOTHING) poi = models.ForeignKey(PointOfInterest, on_delete=models.DO_NOTHING) diff --git a/sistema/urls.py b/sistema/urls.py index 9f5c7d4..09d1c1c 100644 --- a/sistema/urls.py +++ b/sistema/urls.py @@ -49,4 +49,4 @@ urlpatterns = [ ## FEEDBACK ## path('feedback/', FeedbackView.as_view(), name='feedback'), -] +] \ No newline at end of file diff --git a/sistema/views.py b/sistema/views.py index cfc71a7..0b93a94 100644 --- a/sistema/views.py +++ b/sistema/views.py @@ -149,7 +149,6 @@ class LocalitaView(View):#PermissionRequiredMixin return redirect(reverse('sistema:localita_list')) - class TipoMultimediaView(View):#PermissionRequiredMixin #permission_required = [settings.TOUR_OPERATOR_GROUPS, settings.ADMIN_GROUPS] diff --git a/utenti/datatables.py b/utenti/datatables.py index 0b5ef44..174cb55 100644 --- a/utenti/datatables.py +++ b/utenti/datatables.py @@ -53,6 +53,7 @@ class UserDatatables(BaseDatatableView): else: return super(UserDatatables, self).render_column(row, column) + def filter_queryset(self, qs): search = self.request.GET.get('search[value]', None) if search: diff --git a/utenti/forms.py b/utenti/forms.py index 1318f3c..a6616a0 100644 --- a/utenti/forms.py +++ b/utenti/forms.py @@ -14,6 +14,7 @@ class UserEditForm(UserChangeForm): exclude = ['username', 'is_staff', 'is_superuser', 'last_login', 'groups', 'user_permissions', 'is_active', 'date_joined', 'password'] + class CustomUserCreationForm(forms.ModelForm): class Meta: model = User diff --git a/utenti/urls.py b/utenti/urls.py index 7c71045..e5aab1f 100644 --- a/utenti/urls.py +++ b/utenti/urls.py @@ -29,6 +29,7 @@ urlpatterns = [ path('tour_operator/', TourOperatorView.as_view(), name='tour_operator'), path('mod_tour_operator//', TourOperatorView.as_view(), name='mod_tour_operator'), + ## CLIENTE ## path('cliente/', ClienteView.as_view(), name='cliente'), path('mod_cliente//', ClienteView.as_view(), name='mod_cliente'), diff --git a/utenti/views.py b/utenti/views.py index a5cb568..e146b26 100644 --- a/utenti/views.py +++ b/utenti/views.py @@ -232,8 +232,3 @@ class AdminView(View):#PermissionRequiredMixin return redirect(reverse('utenti:admin_list')) -# from braces.views import GroupRequiredMixin -# class SomeProtectedView(GroupRequiredMixin, TemplateView): -# -# #required -# group_required = [u"editors", u"admins"] \ No newline at end of file