Merge branch '7068/remove-public-prefix' into 'master'

7068/remove public prefix

See merge request ungleich-public/dynamicweb!711
This commit is contained in:
pcoder116 2019-08-22 05:11:54 +02:00
commit 55f55b6885
2 changed files with 3 additions and 1 deletions

View file

@ -1,3 +1,5 @@
2.6.2: 2019-08-22
* #7068: [django/node/rails] Remove public- prefix from OS template names (MR!711)
2.6.1: 2019-07-09 2.6.1: 2019-07-09
* #6941: [hosting dashboard] Show the card's expiry year & month too in the list of added cards (MR!710) * #6941: [hosting dashboard] Show the card's expiry year & month too in the list of added cards (MR!710)
2.6: 2019-07-03 2.6: 2019-07-03

View file

@ -57,7 +57,7 @@
<label for="configuration">Configuration: </label> <label for="configuration">Configuration: </label>
<select class="form-control" name="vm_template_id" id="{{vm.hosting_company}}-configuration" data-vm-type="{{vm.hosting_company}}"> <select class="form-control" name="vm_template_id" id="{{vm.hosting_company}}-configuration" data-vm-type="{{vm.hosting_company}}">
{% for template in templates %} {% for template in templates %}
<option value="{{template.id}}">{{ template.name }}</option> <option value="{{template.id}}">{{ template.name|cut:'public-' }}</option>
{% endfor %} {% endfor %}
</select> </select>
</li> </li>