From 687acea19a908a09317a8f5475381b33773d5b73 Mon Sep 17 00:00:00 2001 From: Bruksx Date: Wed, 30 Sep 2026 19:21:16 +0100 Subject: [PATCH] updates --- alplora/urls.py | 2 + datacenterlight/urls.py | 2 + dynamicweb/settings/base.py | 2 +- dynamicweb/urls.py | 10 ++-- hosting/urls.py | 4 +- legacy_compat.py | 9 +++- nosystemd/urls.py | 97 ++++++++++++++++++++++++++++--------- opennebula_api/urls.py | 31 +++++++++--- updated_requirements.txt | 8 ++- 9 files changed, 125 insertions(+), 40 deletions(-) diff --git a/alplora/urls.py b/alplora/urls.py index 058f5499..48bbee20 100644 --- a/alplora/urls.py +++ b/alplora/urls.py @@ -3,6 +3,8 @@ from django.conf.urls import url from .views import IndexView, LoginView, ContactView +app_name = "alplora" + urlpatterns = [ url(r'^$', IndexView.as_view(), name='index'), url(r'login/', LoginView.as_view(), name='login'), diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 13296de7..c44b94fd 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -7,6 +7,8 @@ from .views import ( WhyDataCenterLightView, ContactUsView ) +app_name = "datacenterlight" + urlpatterns = [ url(r'^$', IndexView.as_view(), name='index'), url(r'^t/$', IndexView.as_view(), name='index_t'), diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 3e62b85d..e1d2e655 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -96,7 +96,7 @@ INSTALLED_APPS = ( 'djangocms_multisite', 'easy_thumbnails', 'utils', - #'stored_messages', + 'stored_messages', 'mptt', 'parler', 'guardian', diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 44c0ec27..1f447519 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -18,6 +18,7 @@ from django.views.generic import RedirectView from django.urls import reverse_lazy import debug_toolbar + urlpatterns = [ url(r'^index.html$', LandingView.as_view()), url(r'^open_api/', @@ -30,7 +31,7 @@ urlpatterns = [ name="django.hosting"), url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), - url(r'^jsi18n/(?P\S+?)/$', i18n.javascript_catalog), + url(r'^jsi18n/(?P\S+?)/$', i18n.JavaScriptCatalog.as_view()), url(r'^product/(?P[\w-]+)/$', PaymentOrderView.as_view(), name='show_product'), @@ -42,11 +43,12 @@ urlpatterns += i18n_patterns( # note the django CMS URLs included via i18n_patterns REDIRECT_TO_CMS = False -if Page.objects.filter(site_id=Site.objects.get_current().id).count(): - REDIRECT_TO_CMS = True +"""TODO:if Page.objects.filter(site_id=Site.objects.get_current().id).count(): + REDIRECT_TO_CMS = True""" + urlpatterns += i18n_patterns( - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url(r'^datacenterlight/', include('datacenterlight.urls', namespace="datacenterlight")), url(r'^hosting/', RedirectView.as_view(url=reverse_lazy('hosting:login')), diff --git a/hosting/urls.py b/hosting/urls.py index e34d27d6..dabc6519 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -14,6 +14,8 @@ from .views import ( InvoiceListView, InvoiceDetailView, CheckUserVM ) +app_name = "hosting" + urlpatterns = [ url(r'index/?$', IndexView.as_view(), name='index'), url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'), @@ -69,7 +71,7 @@ urlpatterns = [ name='reset_password'), url(r'reset-password-confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', PasswordResetConfirmView.as_view(), name='reset_password_confirm'), - url(r'^logout/?$', auth_views.logout, + url(r'^logout/?$', auth_views.LogoutView.as_view(), {'next_page': '/hosting/login?logged_out=true'}, name='logout'), url(r'^validate/(?P.*)/$', SignupValidatedView.as_view(), name='validate') diff --git a/legacy_compat.py b/legacy_compat.py index 13b8970a..adac4be3 100644 --- a/legacy_compat.py +++ b/legacy_compat.py @@ -520,4 +520,11 @@ def install_backport_collections_shim(): sys.modules["backport_collections"] = module -install_backport_collections_shim() \ No newline at end of file +install_backport_collections_shim() + + +import django.template.library +from django.template.library import Library + +if not hasattr(Library, "assignment_tag"): + Library.assignment_tag = Library.simple_tag \ No newline at end of file diff --git a/nosystemd/urls.py b/nosystemd/urls.py index 7c3965f8..98587990 100644 --- a/nosystemd/urls.py +++ b/nosystemd/urls.py @@ -1,26 +1,77 @@ -from django.conf.urls import url -from django.contrib.auth import views as auth_views +from django.urls import path +from django.contrib.auth.views import LogoutView + +from .views import ( + LandingView, + LoginView, + SignupView, + PasswordResetView, + PasswordResetConfirmView, + DonationView, + DonationDetailView, + ChangeDonatorStatusDetailView, + DonatorStatusDetailView, + DonationListView, +) + + +app_name = "nosystemd" -from .views import LandingView, LoginView, SignupView, PasswordResetView,\ - PasswordResetConfirmView, DonationView, DonationDetailView, ChangeDonatorStatusDetailView,\ - DonatorStatusDetailView, DonationListView urlpatterns = [ - url(r'^$', LandingView.as_view(), name='landing'), - url(r'^login/?$', LoginView.as_view(), name='login'), - url(r'^signup/?$', SignupView.as_view(), name='signup'), - url(r'^logout/?$', auth_views.logout, - {'next_page': '/nosystemd/login?logged_out=true'}, name='logout'), - url(r'reset-password/?$', PasswordResetView.as_view(), name='reset_password'), - url(r'reset-password-confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', - PasswordResetConfirmView.as_view(), name='reset_password_confirm'), - url(r'^donations/?$', DonationListView.as_view(), name='donations'), - url(r'donations/(?P\d+)/?$', DonationDetailView.as_view(), name='donations'), - url(r'^make_donation/?$', DonationView.as_view(), name='make_donation'), - url(r'donations/status/?$', DonatorStatusDetailView.as_view(), - name='donator_status'), - url(r'donations/status/(?P\d+)/?$', ChangeDonatorStatusDetailView.as_view(), - name='change_donator_status'), - # url(r'^donation/invoice?$', DonationView.as_view(), name='donation_detail'), - -] + path( + "", + LandingView.as_view(), + name="landing", + ), + path( + "login/", + LoginView.as_view(), + name="login", + ), + path( + "signup/", + SignupView.as_view(), + name="signup", + ), + path( + "logout/", + LogoutView.as_view(next_page="/nosystemd/login?logged_out=true"), + name="logout", + ), + path( + "reset-password/", + PasswordResetView.as_view(), + name="reset_password", + ), + path( + "reset-password-confirm/-/", + PasswordResetConfirmView.as_view(), + name="reset_password_confirm", + ), + path( + "donations/", + DonationListView.as_view(), + name="donations", + ), + path( + "donations//", + DonationDetailView.as_view(), + name="donations", + ), + path( + "make_donation/", + DonationView.as_view(), + name="make_donation", + ), + path( + "donations/status/", + DonatorStatusDetailView.as_view(), + name="donator_status", + ), + path( + "donations/status//", + ChangeDonatorStatusDetailView.as_view(), + name="change_donator_status", + ), +] \ No newline at end of file diff --git a/opennebula_api/urls.py b/opennebula_api/urls.py index 87976e2e..5e58ab5b 100644 --- a/opennebula_api/urls.py +++ b/opennebula_api/urls.py @@ -1,13 +1,28 @@ -from django.conf.urls import url, include +from django.urls import include, path + from rest_framework.urlpatterns import format_suffix_patterns + from .views import VmCreateView, VmDetailsView -urlpatterns = { - url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), - url(r'^vms/$', VmCreateView.as_view(), name="vm_create"), - url(r'^vms/(?P[0-9]+)/$', VmDetailsView.as_view(), - name="vm_details"), -} +app_name = "opennebula_api" -urlpatterns = format_suffix_patterns(urlpatterns) + +urlpatterns = [ + path( + "auth/", + include("rest_framework.urls", namespace="rest_framework"), + ), + path( + "vms/", + VmCreateView.as_view(), + name="vm_create", + ), + path( + "vms//", + VmDetailsView.as_view(), + name="vm_details", + ), +] + +urlpatterns = format_suffix_patterns(urlpatterns) \ No newline at end of file diff --git a/updated_requirements.txt b/updated_requirements.txt index 4d9dbf75..54cb6650 100644 --- a/updated_requirements.txt +++ b/updated_requirements.txt @@ -19,7 +19,7 @@ django-appconf==1.2.0 django-appdata==0.4.0 django-bootstrap3==26.2 django-classy-tags==0.8.0 -django-cms==5.1.3 +django-debug-toolbar==8.0.0 django-filer==3.6.0 django-formtools==2.1 django-guardian==3.5.0 @@ -31,9 +31,11 @@ django-multisite==1.9.0 django-parler==2.4 django-phonenumber-field==1.3.0 django-polymorphic==4.11.7 -django-reversion==1.10.2 +django-recaptcha==4.1.0 +django-reversion==6.3.0 django-sekizai==0.10.0 django-sortedm2m==4.0.0 +django-stored-messages==1.4.0 django-taggit==6.1.0 django-taggit-autosuggest==0.4.2 django-taggit-templatetags==0.2.5 @@ -64,6 +66,7 @@ pyasn1==0.6.4 pycrypto==2.6.1 pycryptodome==3.23.0 pymemcache==4.0.0 +PyOTP==2.10.0 python-dateutil==2.9.0.post0 python-dotenv==1.2.3 python-slugify==9.1.2 @@ -72,6 +75,7 @@ rcssmin==1.2.2 requests==2.34.2 requests-file==3.0.1 rjsmin==1.2.5 +setuptools==84.0.0 six==1.17.0 sqlparse==0.6.0 stripe==15.6.1