rooty/yubiadmin
1
0
Fork 0
mirror of https://github.com/Yubico/yubiadmin.git synced 2025-02-22 02:54:16 +01:00
Code Issues Projects Releases Wiki Activity

Added fallbacks for title and description if docstring is missing.

Browse Source
This commit is contained in:
Dain Nilsson 2013-05-31 15:30:02 +02:00
parent 802bc8e43b
commit 6dabc61dce
5 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yubiadmin/apps/admin.py
View File

@ -81,9 +81,6 @@ class YubiAdmin(App):
sections = ['general'] sections = ['general']
def general(self, request): def general(self, request):
"""
General
"""
return self.render_forms(request, return self.render_forms(request,
[ConnectionForm(), CredentialsForm()], [ConnectionForm(), CredentialsForm()],
template='admin/general') template='admin/general')

9
yubiadmin/apps/auth.py
View File

@ -198,15 +198,9 @@ class YubiAuthApp(App):
return ['general', 'database', 'validation', 'users', 'advanced'] return ['general', 'database', 'validation', 'users', 'advanced']
def general(self, request): def general(self, request):
"""
General
"""
return self.render_forms(request, [SecurityForm(), HSMForm()]) return self.render_forms(request, [SecurityForm(), HSMForm()])
def database(self, request): def database(self, request):
"""
Database
"""
return self.render_forms(request, [DatabaseForm()]) return self.render_forms(request, [DatabaseForm()])
def validation(self, request): def validation(self, request):
@ -216,9 +210,6 @@ class YubiAuthApp(App):
return self.render_forms(request, [ValidationServerForm()]) return self.render_forms(request, [ValidationServerForm()])
def advanced(self, request): def advanced(self, request):
"""
Advanced
"""
return self.render_forms(request, [ return self.render_forms(request, [
FileForm(AUTH_CONFIG_FILE, 'Configuration', lang='python') FileForm(AUTH_CONFIG_FILE, 'Configuration', lang='python')
], script='editor') ], script='editor')

5
yubiadmin/apps/freerad.py
View File

@ -77,9 +77,6 @@ class FreeRadius(App):
self._clients = RadiusClients() self._clients = RadiusClients()
def general(self, request): def general(self, request):
"""
General
"""
alerts = [] alerts = []
form = RadTestForm() form = RadTestForm()
@ -107,7 +104,7 @@ class FreeRadius(App):
return render('freerad/general', form=form, alerts=alerts, return render('freerad/general', form=form, alerts=alerts,
running=is_freerad_running()) running=is_freerad_running())
def _clients(self, request): def _unused_clients(self, request):
""" """
RADIUS clients RADIUS clients
""" """

9
yubiadmin/apps/val.py
View File

@ -221,9 +221,6 @@ class YubikeyVal(App):
self._clients = YubikeyValClients() self._clients = YubikeyValClients()
def general(self, request): def general(self, request):
"""
General
"""
return self.render_forms(request, [SyncLevelsForm(), MiscForm()]) return self.render_forms(request, [SyncLevelsForm(), MiscForm()])
def clients(self, request): def clients(self, request):
@ -241,9 +238,6 @@ class YubikeyVal(App):
return self.render_forms(request, [dbform]) return self.render_forms(request, [dbform])
def synchronization(self, request): def synchronization(self, request):
"""
Synchronization
"""
return self.render_forms(request, [DaemonForm(), SyncPoolForm()], return self.render_forms(request, [DaemonForm(), SyncPoolForm()],
template='val/synchronization', template='val/synchronization',
daemon_running=is_daemon_running()) daemon_running=is_daemon_running())
@ -266,9 +260,6 @@ class YubikeyVal(App):
return self.render_forms(request, [KSMForm()]) return self.render_forms(request, [KSMForm()])
def advanced(self, request): def advanced(self, request):
"""
Advanced
"""
return self.render_forms(request, [ return self.render_forms(request, [
FileForm(YKVAL_CONFIG_FILE, 'Configuration', lang='php') FileForm(YKVAL_CONFIG_FILE, 'Configuration', lang='php')
], script='editor') ], script='editor')

16
yubiadmin/server.py
View File

@ -33,12 +33,20 @@ from yubiadmin.apps import apps
def inspect_app(app): def inspect_app(app):
doc = app.__doc__.strip() if app.__doc__:
title, desc = doc.split('\n', 1) doc = app.__doc__.strip()
desc = desc.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 = [{ sections = [{
'name': section, '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)) 'advanced': bool(getattr(getattr(app, section), 'advanced', False))
} for section in app.sections] } for section in app.sections]