mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-22 11:23:10 +00:00
Printer app really is optionnal
This commit is contained in:
parent
00c9b80e6a
commit
4595d99117
2 changed files with 12 additions and 1 deletions
|
@ -29,6 +29,7 @@ from django.contrib import messages
|
||||||
|
|
||||||
from preferences.models import GeneralOption, OptionalMachine
|
from preferences.models import GeneralOption, OptionalMachine
|
||||||
|
|
||||||
|
from re2o.settings import INSTALLED_APPS
|
||||||
|
|
||||||
def context_user(request):
|
def context_user(request):
|
||||||
"""Fonction de context lorsqu'un user est logué (ou non),
|
"""Fonction de context lorsqu'un user est logué (ou non),
|
||||||
|
@ -50,7 +51,6 @@ def context_user(request):
|
||||||
'ipv6_enabled': OptionalMachine.get_cached_value('ipv6'),
|
'ipv6_enabled': OptionalMachine.get_cached_value('ipv6'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def date_now(request):
|
def date_now(request):
|
||||||
"""Add the current date in the context for quick informations and
|
"""Add the current date in the context for quick informations and
|
||||||
comparisons"""
|
comparisons"""
|
||||||
|
@ -58,3 +58,12 @@ def date_now(request):
|
||||||
'now_aware': datetime.datetime.now(datetime.timezone.utc),
|
'now_aware': datetime.datetime.now(datetime.timezone.utc),
|
||||||
'now_naive': datetime.datetime.now()
|
'now_naive': datetime.datetime.now()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def context_printer(request):
|
||||||
|
"""
|
||||||
|
Useful to know whether the printer app is activated or not
|
||||||
|
"""
|
||||||
|
printer = 'printer' in INSTALLED_APPS
|
||||||
|
return {
|
||||||
|
'printer': printer,
|
||||||
|
}
|
||||||
|
|
|
@ -112,12 +112,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
|
{% if printer %}
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-print"></i> Printer<span class="caret"></span></a>
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-print"></i> Printer<span class="caret"></span></a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li><a href="{% url "printer:new-job" %}"><i class="fa fa-print"></i> {% trans "Print" %}</a></li>
|
<li><a href="{% url "printer:new-job" %}"><i class="fa fa-print"></i> {% trans "Print" %}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
{% endif %}
|
||||||
{% can_view_app logs %}
|
{% can_view_app logs %}
|
||||||
<li><a href="{% url "logs:index" %}"><i class="fa fa-chart-area"></i> {% trans "Statistics" %}</a></li>
|
<li><a href="{% url "logs:index" %}"><i class="fa fa-chart-area"></i> {% trans "Statistics" %}</a></li>
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
|
|
Loading…
Reference in a new issue