Commit 46d6d14f authored by Alex Pyrgiotis's avatar Alex Pyrgiotis
Browse files

admin: Lift restriction on charts

Remove `ADMIN_ENABLE_CHARTS`, as we now use C3 instead of Highcharts.
parent f4a7ef79
......@@ -37,7 +37,6 @@
<a href="{% url admin-home %}" title="Homepage" class="navbar-brand home-icon"><img src="{{ BRANDING_IMAGE_MEDIA_URL }}cloudbar_home.png" alt="S" /></a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-left">
{% for view, view_dict in views.items %}
......@@ -50,9 +49,7 @@
<span class="snf-angle-down arrow"></span></a>
<ul class="dropdown-menu align-left">
<li {% block nav-stats %}{% endblock %}><a href="{% url admin-stats %}">Stats</a></li>
{% if ADMIN_ENABLE_CHARTS %}
<li {% block nav-charts %}{% endblock %}><a href="{% url admin-charts %}">Charts</a></li>
{% endif %}
</ul>
</li>
</ul>
......
......@@ -143,7 +143,6 @@ def admin_user_required(func, permitted_groups=admin_settings.\
default_dict = {
'ADMIN_MEDIA_URL': admin_settings.ADMIN_MEDIA_URL,
'UI_MEDIA_URL': UI_MEDIA_URL,
'ADMIN_ENABLE_CHARTS': admin_settings.ADMIN_ENABLE_CHARTS,
'mail': {
'sender': astakos_settings.SERVER_EMAIL,
'subject': sample_subject,
......@@ -193,10 +192,6 @@ def stats(request):
@admin_user_required
def charts(request):
"""Charts view."""
if not admin_settings.ADMIN_ENABLE_CHARTS:
raise AdminHttp404("The charting functionality has been disabled.\n"
"For more information, please consult the Synnefo "
"settings.")
admin_log(request)
return direct_to_template(request, "admin/charts.html",
extra_context=default_dict)
......
......@@ -33,18 +33,6 @@ AUTH_COOKIE_NAME = getattr(settings, 'ADMIN_AUTH_COOKIE_NAME',
getattr(settings, 'UI_AUTH_COOKIE_NAME',
'_pithos2_a'))
# This setting enables the charts presentation of Astakos/Cyclades resources.
# The charting software that is used is Highcharts by HighSoft AS.
#
# Due to the licensing nature of Highcharts, it is disabled by default. You can
# view the Highcharts license [1] and the accompanying FAQ [2], to decide
# whether to enable it or not.
#
# [1]: www.highcharts.com/license, http://shop.highsoft.com/highcharts.html
# [2]: http://shop.highsoft.com/highcharts.html,
# http://shop.highsoft.com/faq/non-commercial
ADMIN_ENABLE_CHARTS = getattr(settings, 'ADMIN_ENABLE_CHARTS', False)
# A dictionary with the enabled admin model views.
DEFAULT_ADMIN_VIEWS = {
'user': {'label': 'Users'},
......
......@@ -6,18 +6,6 @@
#ADMIN_MEDIA_URL = ""
#ADMIN_AUTH_COOKIE_NAME = '_pithos2_a'
# This setting enables the charts presentation of Astakos/Cyclades resources.
# The charting software that is used is Highcharts by HighSoft AS.
#
# Due to the licensing nature of Highcharts, it is disabled by default. You can
# view the Highcharts license [1] and the accompanying FAQ [2], to decide
# whether to enable it or not.
#
# [1]: www.highcharts.com/license, http://shop.highsoft.com/highcharts.html
# [2]: http://shop.highsoft.com/highcharts.html,
# http://shop.highsoft.com/faq/non-commercial
#ADMIN_ENABLE_CHARTS = False
## A dictionary with the enabled admin model views.
#ADMIN_VIEWS = {
# 'user': {'label': 'Users'},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment