From 9dc719abcb90b3fcd3c4d9f61670f90871935d88 Mon Sep 17 00:00:00 2001 From: jorgepastorr Date: Wed, 29 May 2024 17:55:01 +0200 Subject: [PATCH] musician reorder code websites,webapps --- orchestra/contrib/musician/urls.py | 6 ++++++ orchestra/contrib/musician/views.py | 4 ++-- .../contrib/musician/{tidy_forms => webapps}/__init__.py | 0 .../musician/{tidy_forms/webapps.py => webapps/forms.py} | 0 .../musician/{tidy_views/webapps.py => webapps/views.py} | 2 +- .../contrib/musician/{tidy_views => websites}/__init__.py | 0 .../musician/{tidy_forms/websites.py => websites/forms.py} | 0 .../musician/{tidy_views/websites.py => websites/views.py} | 2 +- 8 files changed, 10 insertions(+), 4 deletions(-) rename orchestra/contrib/musician/{tidy_forms => webapps}/__init__.py (100%) rename orchestra/contrib/musician/{tidy_forms/webapps.py => webapps/forms.py} (100%) rename orchestra/contrib/musician/{tidy_views/webapps.py => webapps/views.py} (97%) rename orchestra/contrib/musician/{tidy_views => websites}/__init__.py (100%) rename orchestra/contrib/musician/{tidy_forms/websites.py => websites/forms.py} (100%) rename orchestra/contrib/musician/{tidy_views/websites.py => websites/views.py} (97%) diff --git a/orchestra/contrib/musician/urls.py b/orchestra/contrib/musician/urls.py index 607d344b..3ad1e1a4 100644 --- a/orchestra/contrib/musician/urls.py +++ b/orchestra/contrib/musician/urls.py @@ -25,19 +25,25 @@ urlpatterns = [ path('billing/', views.BillingView.as_view(), name='billing'), path('bills//download/', views.BillDownloadView.as_view(), name='bill-download'), + path('profile/', views.ProfileView.as_view(), name='profile'), path('profile/setLang/', views.profile_set_language, name='profile-set-lang'), + path('address/', views.AddressListView.as_view(), name='address-list'), path('address/new/', views.MailCreateView.as_view(), name='address-create'), path('address//', views.MailUpdateView.as_view(), name='address-update'), path('address//delete/', views.AddressDeleteView.as_view(), name='address-delete'), + path('mailboxes/', views.MailboxListView.as_view(), name='mailbox-list'), path('mailboxes/new/', views.MailboxCreateView.as_view(), name='mailbox-create'), path('mailboxes//', views.MailboxUpdateView.as_view(), name='mailbox-update'), path('mailboxes//delete/', views.MailboxDeleteView.as_view(), name='mailbox-delete'), path('mailboxes//change-password/', views.MailboxChangePasswordView.as_view(), name='mailbox-password'), + path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'), + path('databases/', views.DatabaseListView.as_view(), name='database-list'), + path('saas/', views.SaasListView.as_view(), name='saas-list'), path('webappusers/', views.WebappUserListView.as_view(), name='webappuser-list'), diff --git a/orchestra/contrib/musician/views.py b/orchestra/contrib/musician/views.py index 6a7f0e0f..95d1ad8b 100644 --- a/orchestra/contrib/musician/views.py +++ b/orchestra/contrib/musician/views.py @@ -50,8 +50,8 @@ from .models import MailinglistService, SaasService from .settings import ALLOWED_RESOURCES, MUSICIAN_EDIT_ENABLE_PHP_OPTIONS from .utils import get_bootstraped_percent -from .tidy_views.webapps import * -from .tidy_views.websites import * +from .webapps.views import * +from .websites.views import * logger = logging.getLogger(__name__) diff --git a/orchestra/contrib/musician/tidy_forms/__init__.py b/orchestra/contrib/musician/webapps/__init__.py similarity index 100% rename from orchestra/contrib/musician/tidy_forms/__init__.py rename to orchestra/contrib/musician/webapps/__init__.py diff --git a/orchestra/contrib/musician/tidy_forms/webapps.py b/orchestra/contrib/musician/webapps/forms.py similarity index 100% rename from orchestra/contrib/musician/tidy_forms/webapps.py rename to orchestra/contrib/musician/webapps/forms.py diff --git a/orchestra/contrib/musician/tidy_views/webapps.py b/orchestra/contrib/musician/webapps/views.py similarity index 97% rename from orchestra/contrib/musician/tidy_views/webapps.py rename to orchestra/contrib/musician/webapps/views.py index f54e14de..d1319022 100644 --- a/orchestra/contrib/musician/tidy_views/webapps.py +++ b/orchestra/contrib/musician/webapps/views.py @@ -10,7 +10,7 @@ from orchestra.contrib.musician.mixins import (CustomContextMixin, ExtendedPagin UserTokenRequiredMixin) from orchestra.contrib.webapps.models import WebApp, WebAppOption -from orchestra.contrib.musician.tidy_forms.webapps import WebappOptionCreateForm, WebappOptionUpdateForm +from .forms import WebappOptionCreateForm, WebappOptionUpdateForm from orchestra.contrib.musician.settings import MUSICIAN_EDIT_ENABLE_PHP_OPTIONS diff --git a/orchestra/contrib/musician/tidy_views/__init__.py b/orchestra/contrib/musician/websites/__init__.py similarity index 100% rename from orchestra/contrib/musician/tidy_views/__init__.py rename to orchestra/contrib/musician/websites/__init__.py diff --git a/orchestra/contrib/musician/tidy_forms/websites.py b/orchestra/contrib/musician/websites/forms.py similarity index 100% rename from orchestra/contrib/musician/tidy_forms/websites.py rename to orchestra/contrib/musician/websites/forms.py diff --git a/orchestra/contrib/musician/tidy_views/websites.py b/orchestra/contrib/musician/websites/views.py similarity index 97% rename from orchestra/contrib/musician/tidy_views/websites.py rename to orchestra/contrib/musician/websites/views.py index 9d135dcd..f7791fb3 100644 --- a/orchestra/contrib/musician/tidy_views/websites.py +++ b/orchestra/contrib/musician/websites/views.py @@ -12,7 +12,7 @@ from orchestra.contrib.musician.mixins import (CustomContextMixin, ExtendedPagin UserTokenRequiredMixin) from orchestra.contrib.websites.models import Website, Content, WebsiteDirective -from orchestra.contrib.musician.tidy_forms.websites import ( WebsiteUpdateForm, WesiteContentCreateForm, +from .forms import ( WebsiteUpdateForm, WesiteContentCreateForm, WesiteDirectiveCreateForm)