time exceptions: add some details to the delete confirmation popup (#37419)
This commit is contained in:
parent
fe8f29d4d4
commit
7908d97ca0
|
@ -2,7 +2,7 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
{% block appbar %}
|
{% block appbar %}
|
||||||
<h2>{{ view.model.get_verbose_name }}</h2>
|
<h2>{{ object }}</h2>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
{% blocktrans %}This cannot be removed as there are bookings for a future date.
|
{% blocktrans %}This cannot be removed as there are bookings for a future date.
|
||||||
{% endblocktrans %}
|
{% endblocktrans %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% blocktrans %}Are you sure you want to delete this?{% endblocktrans %}
|
{% blocktrans %}Are you sure you want to delete this exception?{% endblocktrans %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
|
|
|
@ -250,7 +250,7 @@ def test_delete_busy_agenda(app, admin_user):
|
||||||
resp = app.get('/manage/', status=200)
|
resp = app.get('/manage/', status=200)
|
||||||
resp = resp.click('Foo bar').follow()
|
resp = resp.click('Foo bar').follow()
|
||||||
resp = resp.click('Delete')
|
resp = resp.click('Delete')
|
||||||
assert 'Are you sure you want to delete this?' in resp.text
|
assert 'Are you sure you want to delete this exception?' in resp.text
|
||||||
|
|
||||||
booking = Booking(event=event)
|
booking = Booking(event=event)
|
||||||
booking.save()
|
booking.save()
|
||||||
|
@ -264,7 +264,7 @@ def test_delete_busy_agenda(app, admin_user):
|
||||||
resp = app.get('/manage/', status=200)
|
resp = app.get('/manage/', status=200)
|
||||||
resp = resp.click('Foo bar').follow()
|
resp = resp.click('Foo bar').follow()
|
||||||
resp = resp.click('Delete')
|
resp = resp.click('Delete')
|
||||||
assert 'Are you sure you want to delete this?' in resp.text
|
assert 'Are you sure you want to delete this exception?' in resp.text
|
||||||
|
|
||||||
# suddenly the booking is no longer cancelled, but the admin clicks on the
|
# suddenly the booking is no longer cancelled, but the admin clicks on the
|
||||||
# delete button.
|
# delete button.
|
||||||
|
@ -300,7 +300,7 @@ def test_delete_busy_desk(app, admin_user):
|
||||||
resp = resp.click('Settings')
|
resp = resp.click('Settings')
|
||||||
desk_page = resp.click('Desk A')
|
desk_page = resp.click('Desk A')
|
||||||
desk_delete_page = desk_page.click('Delete')
|
desk_delete_page = desk_page.click('Delete')
|
||||||
assert 'Are you sure you want to delete this?' in desk_delete_page.text
|
assert 'Are you sure you want to delete this exception?' in desk_delete_page.text
|
||||||
# make sure the deleting is not disabled
|
# make sure the deleting is not disabled
|
||||||
assert 'disabled' not in desk_delete_page.text
|
assert 'disabled' not in desk_delete_page.text
|
||||||
|
|
||||||
|
@ -488,7 +488,7 @@ def test_delete_busy_event(app, admin_user):
|
||||||
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
|
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
|
||||||
resp = resp.click(href=r'/manage/events/%s/$' % event.id)
|
resp = resp.click(href=r'/manage/events/%s/$' % event.id)
|
||||||
resp = resp.click('Delete')
|
resp = resp.click('Delete')
|
||||||
assert 'Are you sure you want to delete this?' in resp.text
|
assert 'Are you sure you want to delete this exception?' in resp.text
|
||||||
|
|
||||||
booking = Booking(event=event)
|
booking = Booking(event=event)
|
||||||
booking.save()
|
booking.save()
|
||||||
|
@ -502,7 +502,7 @@ def test_delete_busy_event(app, admin_user):
|
||||||
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
|
resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
|
||||||
resp = resp.click(href=r'/manage/events/%s/$' % event.id)
|
resp = resp.click(href=r'/manage/events/%s/$' % event.id)
|
||||||
resp = resp.click('Delete')
|
resp = resp.click('Delete')
|
||||||
assert 'Are you sure you want to delete this?' in resp.text
|
assert 'Are you sure you want to delete this exception?' in resp.text
|
||||||
|
|
||||||
# suddenly the booking is no longer cancelled, but the admin clicks on the
|
# suddenly the booking is no longer cancelled, but the admin clicks on the
|
||||||
# delete button.
|
# delete button.
|
||||||
|
|
Loading…
Reference in New Issue