pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

filter servers on databases, show only database servers

This commit is contained in:
Jorge Pastor 2023-12-15 09:58:44 +01:00
parent f067732802
commit 2ca503a945
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
orchestra/contrib/databases/forms.py
View File

@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _
from orchestra.core import validators from orchestra.core import validators
from .models import DatabaseUser, Database from .models import DatabaseUser, Database
from .settings import DATABASES_SERVERS
class DatabaseUserCreationForm(forms.ModelForm): class DatabaseUserCreationForm(forms.ModelForm):
@ -22,6 +23,11 @@ class DatabaseUserCreationForm(forms.ModelForm):
model = DatabaseUser model = DatabaseUser
fields = ('username', 'account', 'type') fields = ('username', 'account', 'type')
def __init__(self, *args, **kwargs):
super(DatabaseUserCreationForm, self).__init__(*args, **kwargs)
qsServer = self.fields['target_server'].queryset.filter(name__in=DATABASES_SERVERS)
self.fields['target_server'].queryset = qsServer
def clean_password2(self): def clean_password2(self):
password1 = self.cleaned_data.get("password1") password1 = self.cleaned_data.get("password1")
password2 = self.cleaned_data.get("password2") password2 = self.cleaned_data.get("password2")
@ -74,6 +80,10 @@ class DatabaseCreationForm(DatabaseUserCreationForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(DatabaseCreationForm, self).__init__(*args, **kwargs) super(DatabaseCreationForm, self).__init__(*args, **kwargs)
account_id = self.initial.get('account', self.initial_account) account_id = self.initial.get('account', self.initial_account)
qsServer = self.fields['target_server'].queryset.filter(name__in=DATABASES_SERVERS)
self.fields['target_server'].queryset = qsServer
if account_id: if account_id:
qs = self.fields['user'].queryset.filter(account=account_id).order_by('username') qs = self.fields['user'].queryset.filter(account=account_id).order_by('username')
choices = [ (u.pk, "%s (%s) (%s)" % (u, u.get_type_display(), str(u.target_server.name) )) for u in qs ] choices = [ (u.pk, "%s (%s) (%s)" % (u, u.get_type_display(), str(u.target_server.name) )) for u in qs ]

9
orchestra/contrib/databases/settings.py
View File

@ -27,3 +27,12 @@ DATABASES_DEFAULT_HOST = Setting('DATABASES_DEFAULT_HOST',
DATABASES_MYSQL_DB_DIR = Setting('DATABASES_MYSQL_DB_DIR', DATABASES_MYSQL_DB_DIR = Setting('DATABASES_MYSQL_DB_DIR',
'/var/lib/mysql', '/var/lib/mysql',
) )
DATABASES_SERVERS = Setting('DATABASES_SERVERS', (
'wpmu',
'mysql.pangea.lan',
'web-11.pangea.lan',
'web-12.pangea.lan',
)
)