shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-25 06:03:51 +03:00
Code Issues Releases Wiki Activity

Fixed report generation on 2.5

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-05-10 10:48:37 +02:00
parent bdefd11ade
commit c846bae301
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/uds/reports/__init__.py
View File

@ -44,7 +44,7 @@ import logging
logger = logging.getLogger(__name__)
__updated__ = '2017-05-03'
__updated__ = '2017-05-10'
availableReports = []
@ -65,8 +65,10 @@ def __init__():
availableReports.append(cls)
def recursiveAdd(p):
if p.generate != reports.Report.generate:
if p.uuid != None:
addReportCls(p)
else:
logger.debug('Report class {} not added because it lacks of uuid (it is probably a base class)'.format(p))
for c in p.__subclasses__():
recursiveAdd(c)

2
server/src/uds/reports/lists/base.py
View File

@ -35,7 +35,7 @@ from __future__ import unicode_literals
from uds.core import reports
from django.utils.translation import ugettext_noop as _
__updated__ = '2015-06-21'
__updated__ = '2017-05-10'
class ListReport(reports.Report):

1
server/src/uds/templates/uds/admin/index.html
View File

@ -199,6 +199,7 @@
{% js_template 'osmanagers' %}
{% js_template 'connectivity' %}
{% js_template 'services_pool' %}
{% js_template 'services_pool_groups' %}
{% js_template 'pool_access_default' %}
{% js_template 'pool_add_access' %}
{% js_template 'configuration' %}

2
server/src/uds/templates/uds/admin/snippets/navbar.html
View File

@ -36,7 +36,6 @@
<li><a class="lnk-deployed_services" href=""><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/pools.png"/> <span class="menu-lnk">{% trans 'Service Pools' %}</span></a></li>
{% if admin %}
<li><a class="lnk-spoolsgroup" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/groups.png"/> <span class="menu-lnk">{% trans 'Groups' %}</span></a></li>
<li><a class="lnk-gallery" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/gallery.png"/> <span class="menu-lnk">{% trans 'Gallery' %}</span></a></li>
{% endif %}
<li><a class="lnk-calendars" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/calendars.png"/> <span class="menu-lnk">{% trans 'Calendars' %}</span></a></li>
<li><a class="lnk-accounts" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/accounts.png"/> <span class="menu-lnk">{% trans 'Accounts' %}</span></a></li>
@ -49,7 +48,6 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/tools.png"/> <span class="menu-lnk">{% trans 'Tools' %} <b class="caret"></b></span></a>
<ul class="dropdown-menu">
<li><a class="lnk-gallery" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/gallery.png"/> <span class="menu-lnk">{% trans 'Gallery' %}</span></a></li>
<li><a class="lnk-spoolsgroup" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/groups.png"/> <span class="menu-lnk">{% trans 'Services Pool Group' %}</span></a></li>
<li><a class="lnk-reports" href=""><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/reports.png"/> <span class="menu-lnk">{% trans 'Reports' %}</a></span></li>
<li><a class="lnk-configuration" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/configuration.png"/> <span class="menu-lnk">{% trans 'Configuration' %}</span></a></li>
<li><a class="lnk-clear_cache" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/flush-cache.png"/> <span class="menu-lnk">{% trans 'Flush cache' %}</span></a></li>