gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Merge branch 'hotfix/0.12.1' into production

Browse source 
* 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:
Jan Dittberner 2020-04-13 15:03:43 +02:00
commit df3628499d
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog.rst
View file

@ -1,6 +1,10 @@
Changelog 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>` * :release:`0.12.0 <2020-04-10>`
* :support:`-` add architecture diagramm for documentation * :support:`-` add architecture diagramm for documentation
* :support:`-` drop environment specific settings * :support:`-` drop environment specific settings

2
gnuviechadmin/gnuviechadmin/__init__.py
View file

@ -1,4 +1,4 @@
# import celery_app to initialize it # import celery_app to initialize it
from gnuviechadmin.celery import app as celery_app # NOQA from gnuviechadmin.celery import app as celery_app # NOQA
__version__ = '0.12.0' __version__ = '0.12.1'

2
gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
View file

@ -116,9 +116,11 @@
<td class="text-info">{% trans "None" %}</td> <td class="text-info">{% trans "None" %}</td>
{% endif %} {% endif %}
<td> <td>
{% if domain.domain.maildomain %}
{% with maildomain=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> <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 %} {% endwith %}
{% endif %}
{% with hostingdomain=domain.domain %} {% 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> <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 %} {% endwith %}