mirror of
https://github.com/Yubico/yubiadmin.git
synced 2025-02-21 17:54:17 +01:00
Added fallbacks for title and description if docstring is missing.
This commit is contained in:
parent
802bc8e43b
commit
6dabc61dce
@ -81,9 +81,6 @@ class YubiAdmin(App):
|
||||
sections = ['general']
|
||||
|
||||
def general(self, request):
|
||||
"""
|
||||
General
|
||||
"""
|
||||
return self.render_forms(request,
|
||||
[ConnectionForm(), CredentialsForm()],
|
||||
template='admin/general')
|
||||
|
@ -198,15 +198,9 @@ class YubiAuthApp(App):
|
||||
return ['general', 'database', 'validation', 'users', 'advanced']
|
||||
|
||||
def general(self, request):
|
||||
"""
|
||||
General
|
||||
"""
|
||||
return self.render_forms(request, [SecurityForm(), HSMForm()])
|
||||
|
||||
def database(self, request):
|
||||
"""
|
||||
Database
|
||||
"""
|
||||
return self.render_forms(request, [DatabaseForm()])
|
||||
|
||||
def validation(self, request):
|
||||
@ -216,9 +210,6 @@ class YubiAuthApp(App):
|
||||
return self.render_forms(request, [ValidationServerForm()])
|
||||
|
||||
def advanced(self, request):
|
||||
"""
|
||||
Advanced
|
||||
"""
|
||||
return self.render_forms(request, [
|
||||
FileForm(AUTH_CONFIG_FILE, 'Configuration', lang='python')
|
||||
], script='editor')
|
||||
|
@ -77,9 +77,6 @@ class FreeRadius(App):
|
||||
self._clients = RadiusClients()
|
||||
|
||||
def general(self, request):
|
||||
"""
|
||||
General
|
||||
"""
|
||||
alerts = []
|
||||
form = RadTestForm()
|
||||
|
||||
@ -107,7 +104,7 @@ class FreeRadius(App):
|
||||
return render('freerad/general', form=form, alerts=alerts,
|
||||
running=is_freerad_running())
|
||||
|
||||
def _clients(self, request):
|
||||
def _unused_clients(self, request):
|
||||
"""
|
||||
RADIUS clients
|
||||
"""
|
||||
|
@ -221,9 +221,6 @@ class YubikeyVal(App):
|
||||
self._clients = YubikeyValClients()
|
||||
|
||||
def general(self, request):
|
||||
"""
|
||||
General
|
||||
"""
|
||||
return self.render_forms(request, [SyncLevelsForm(), MiscForm()])
|
||||
|
||||
def clients(self, request):
|
||||
@ -241,9 +238,6 @@ class YubikeyVal(App):
|
||||
return self.render_forms(request, [dbform])
|
||||
|
||||
def synchronization(self, request):
|
||||
"""
|
||||
Synchronization
|
||||
"""
|
||||
return self.render_forms(request, [DaemonForm(), SyncPoolForm()],
|
||||
template='val/synchronization',
|
||||
daemon_running=is_daemon_running())
|
||||
@ -266,9 +260,6 @@ class YubikeyVal(App):
|
||||
return self.render_forms(request, [KSMForm()])
|
||||
|
||||
def advanced(self, request):
|
||||
"""
|
||||
Advanced
|
||||
"""
|
||||
return self.render_forms(request, [
|
||||
FileForm(YKVAL_CONFIG_FILE, 'Configuration', lang='php')
|
||||
], script='editor')
|
||||
|
@ -33,12 +33,20 @@ from yubiadmin.apps import apps
|
||||
|
||||
|
||||
def inspect_app(app):
|
||||
doc = app.__doc__.strip()
|
||||
title, desc = doc.split('\n', 1)
|
||||
desc = desc.strip()
|
||||
if app.__doc__:
|
||||
doc = app.__doc__.strip()
|
||||
if '\n' in doc:
|
||||
title, desc = doc.split('\n', 1)
|
||||
desc = desc.strip()
|
||||
else:
|
||||
title = desc = doc
|
||||
else:
|
||||
title = desc = app.__class__.__name__
|
||||
|
||||
sections = [{
|
||||
'name': section,
|
||||
'title': (getattr(app, section).__doc__ or section).strip(),
|
||||
'title': (getattr(app, section).__doc__ or section.capitalize()
|
||||
).strip(),
|
||||
'advanced': bool(getattr(getattr(app, section), 'advanced', False))
|
||||
} for section in app.sections]
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user