entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 9 Releases Wiki Activity

lingo/maps: move delete link to objects list (#29382)

This commit is contained in:
Frédéric Péters 2018-12-30 13:26:47 +01:00
parent cfbf038356
commit bd839d1e78
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
combo/apps/lingo/templates/lingo/regie_form.html
View File

@ -17,9 +17,6 @@
<div class="buttons">
<button class="submit-button">{% trans "Save" %}</button>
<a class="cancel" href="{% url 'lingo-manager-homepage' %}">{% trans 'Cancel' %}</a>
{% if object.id %}
<a class="delete" rel="popup" href="{% url 'lingo-manager-regie-delete' pk=object.id %}">{% trans 'Delete' %}</a>
{% endif %}
</div>
</form>
{% endblock %}

1
combo/apps/lingo/templates/lingo/regie_list.html
View File

@ -23,6 +23,7 @@
<span>({{regie.service}})</span>
{% if regie.is_default %}<span class="extra-info">{% trans "(default regie)" %}</span>{% endif %}
</a>
<a rel="popup" class="delete" href="{% url 'lingo-manager-regie-delete' pk=regie.id %}">{% trans "remove" %}</a>
</li>
{% endfor %}
</ul>

1
combo/apps/maps/templates/maps/manager_home.html
View File

@ -14,6 +14,7 @@
{% for layer in object_list %}
<li>
<a class="layer-icon-{{ layer.icon }}" href="{% url 'maps-manager-layer-edit' slug=layer.slug %}">{{ layer.label }}</a>
<a rel="popup" class="delete" href="{% url 'maps-manager-layer-delete' slug=layer.slug %}">{% trans "remove" %}</a>
</li>
{% endfor %}
</ul>

3
combo/apps/maps/templates/maps/map_layer_form.html
View File

@ -22,9 +22,6 @@
<div class="buttons">
<button class="submit-button">{% trans "Save" %}</button>
<a class="cancel" href="{% url 'maps-manager-homepage' %}">{% trans 'Cancel' %}</a>
{% if object.id %}
<a class="delete" rel="popup" href="{% url 'maps-manager-layer-delete' slug=object.slug %}">{% trans 'Delete' %}</a>
{% endif %}
</div>
</form>
{% endblock %}

3
tests/test_lingo_manager.py
View File

@ -63,8 +63,7 @@ def test_delete_regie(app, admin_user):
test_add_regie(app, admin_user)
app = login(app)
resp = app.get('/manage/lingo/regies/', status=200)
resp = resp.click('Test')
resp = resp.click('Delete')
resp = resp.click('remove')
assert 'Are you sure you want to delete this?' in resp.text
resp = resp.forms[0].submit()
assert resp.location.endswith('/manage/lingo/regies/')

3
tests/test_maps_manager.py
View File

@ -60,8 +60,7 @@ def test_delete_layer(app, admin_user):
test_add_layer(app, admin_user)
app = login(app)
resp = app.get('/manage/maps/', status=200)
resp = resp.click('Test')
resp = resp.click('Delete')
resp = resp.click('remove')
assert 'Are you sure you want to delete this?' in resp.text
resp = resp.forms[0].submit()
assert resp.location.endswith('/manage/maps/')