nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

email_server: Remove aliases view from tabs list

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-10-12 15:00:14 -07:00 committed by James Valleroy
parent b20d5a96c3
commit 9c7c39e61d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plinth/modules/email_server/views.py
View File

@ -18,10 +18,8 @@ from . import aliases, audit, forms
class TabMixin(View): class TabMixin(View):
admin_tabs = [('', _('Home')), ('my_aliases', _('My Aliases')), admin_tabs = [('', _('Home')), ('security', _('Security')),
('security', _('Security')), ('domains', _('Domains'))] ('domains', _('Domains'))]
user_tabs = [('my_aliases', _('My Aliases'))]
def get_context_data(self, *args, **kwargs): def get_context_data(self, *args, **kwargs):
# Retrieve context data from the next method in the MRO # Retrieve context data from the next method in the MRO
@ -33,8 +31,8 @@ class TabMixin(View):
def render_dynamic_tabs(self): def render_dynamic_tabs(self):
if plinth.utils.is_user_admin(self.request): if plinth.utils.is_user_admin(self.request):
return render_tabs(self.request.path, self.admin_tabs) return render_tabs(self.request.path, self.admin_tabs)
else:
return render_tabs(self.request.path, self.user_tabs) return ''
def render_validation_error(self, validation_error, status=400): def render_validation_error(self, validation_error, status=400):
context = self.get_context_data() context = self.get_context_data()
@ -54,22 +52,6 @@ class TabMixin(View):
except Exception as error: except Exception as error:
return self.render_exception(error) return self.render_exception(error)
def find_button(self, post):
key_filter = (k for k in post.keys() if k.startswith('btn_'))
lst = list(itertools.islice(key_filter, 2))
if len(lst) != 1:
raise ValidationError('Bad post data')
if not isinstance(lst[0], str):
raise ValidationError('Bad post data')
return lst[0][len('btn_'):]
def find_form(self, post):
form_name = post.get('form')
for cls in self.form_classes:
if cls.__name__ == form_name:
return cls(post)
raise ValidationError('Form was unspecified')
class EmailServerView(TabMixin, AppView): class EmailServerView(TabMixin, AppView):
"""Server configuration page""" """Server configuration page"""
@ -143,7 +125,7 @@ class MyMailView(TemplateView):
return self.render_to_response(self.get_context_data()) return self.render_to_response(self.get_context_data())
class AliasView(TabMixin, TemplateView): class AliasView(TemplateView):
class Checkboxes: class Checkboxes:
@ -219,12 +201,25 @@ class AliasView(TabMixin, TemplateView):
context['no_alias'] = True context['no_alias'] = True
return context return context
def post(self, request): def _find_form(self, post):
return self.catch_exceptions(self._post, request) form_name = post.get('form')
for cls in self.form_classes:
if cls.__name__ == form_name:
return cls(post)
raise ValidationError('Form was unspecified')
def _post(self, request): def _find_button(self, post):
form = self.find_form(request.POST) key_filter = (k for k in post.keys() if k.startswith('btn_'))
button = self.find_button(request.POST) lst = list(itertools.islice(key_filter, 2))
if len(lst) != 1:
raise ValidationError('Bad post data')
if not isinstance(lst[0], str):
raise ValidationError('Bad post data')
return lst[0][len('btn_'):]
def post(self, request):
form = self._find_form(request.POST)
button = self._find_button(request.POST)
if not form.is_valid(): if not form.is_valid():
raise ValidationError('Form invalid') raise ValidationError('Form invalid')