Merge branch 'hotfix/0.12.1' into production
* hotfix/0.12.1: Add release version to changelog Bump version number Do not show add_mailaddress for nonexistant mail domain
This commit is contained in:
commit
df3628499d
3 changed files with 10 additions and 4 deletions
|
@ -1,6 +1,10 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
* :release:`0.12.1 <2020-04-13>`
|
||||
* :bug:`7` fix handling of undefined mail domains in customer hosting package
|
||||
detail template
|
||||
|
||||
* :release:`0.12.0 <2020-04-10>`
|
||||
* :support:`-` add architecture diagramm for documentation
|
||||
* :support:`-` drop environment specific settings
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# import celery_app to initialize it
|
||||
from gnuviechadmin.celery import app as celery_app # NOQA
|
||||
|
||||
__version__ = '0.12.0'
|
||||
__version__ = '0.12.1'
|
||||
|
|
|
@ -116,9 +116,11 @@
|
|||
<td class="text-info">{% trans "None" %}</td>
|
||||
{% endif %}
|
||||
<td>
|
||||
{% if domain.domain.maildomain %}
|
||||
{% with maildomain=domain.domain.maildomain %}
|
||||
<a href="{% url 'add_mailaddress' package=hostingpackage.id domain=maildomain.domain %}" title="{% trans "Add mail address" %}"><i class="fa fa-envelope"></i><span class="sr-only"> {% trans "Add mail address" %}</span></a>
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
{% with hostingdomain=domain.domain %}
|
||||
<a href="{% url 'add_website' package=hostingpackage.id domain=hostingdomain.domain %}" title="{% trans "Add website" %}"><i class="glyphicon glyphicon-globe"></i><span class="sr-only"> {% trans "Add website" %}</span></a>
|
||||
{% endwith %}
|
||||
|
|
Loading…
Reference in a new issue