Add toast message on mail send
This commit is contained in:
parent
09c422ed15
commit
a63426d1ea
@ -58,14 +58,19 @@ def realm_user(request, realm_id):
|
|||||||
@is_realm_admin
|
@is_realm_admin
|
||||||
@protect_cross_realm_user_access
|
@protect_cross_realm_user_access
|
||||||
def realm_user_detail(request, realm_id, user_dn):
|
def realm_user_detail(request, realm_id, user_dn):
|
||||||
|
return get_rendered_user_details(request, realm_id, user_dn)
|
||||||
|
|
||||||
|
|
||||||
|
def get_rendered_user_details(request, realm_id, user_dn, success_headline=None, success_text=None):
|
||||||
realm = Realm.objects.get(id=realm_id)
|
realm = Realm.objects.get(id=realm_id)
|
||||||
LdapUser.base_dn = realm.ldap_base_dn
|
LdapUser.base_dn = realm.ldap_base_dn
|
||||||
LdapGroup.base_dn = LdapGroup.ROOT_DN
|
LdapGroup.base_dn = LdapGroup.ROOT_DN
|
||||||
|
|
||||||
user = LdapUser.objects.get(dn=user_dn)
|
user = LdapUser.objects.get(dn=user_dn)
|
||||||
user_wrapper = LdapUser.get_extended_user(user)
|
user_wrapper = LdapUser.get_extended_user(user)
|
||||||
groups = LdapGroup.objects.filter(members=user.dn)
|
groups = LdapGroup.objects.filter(members=user.dn)
|
||||||
return render(request, 'user/realm_user_detail.jinja2', {'user': user_wrapper, 'groups': groups, 'realm': realm})
|
return render(request, 'user/realm_user_detail.jinja2',
|
||||||
|
{'user': user_wrapper, 'groups': groups, 'realm': realm, 'success_headline': success_headline,
|
||||||
|
'success_text': success_text})
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@ -183,7 +188,8 @@ def realm_user_resend_welcome_mail(request, realm_id, user_dn):
|
|||||||
protocol = 'https'
|
protocol = 'https'
|
||||||
send_welcome_mail(domain=current_site.domain, email=ldap_user.email, protocol=protocol, realm=realm,
|
send_welcome_mail(domain=current_site.domain, email=ldap_user.email, protocol=protocol, realm=realm,
|
||||||
user=User.objects.get(username=ldap_user.username))
|
user=User.objects.get(username=ldap_user.username))
|
||||||
return redirect('realm-user-detail', realm_id, user_dn)
|
return get_rendered_user_details(request, realm_id, user_dn, success_headline="Willkommensmail",
|
||||||
|
success_text="Willkommensmail erfolgreich versendet.")
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
|
|||||||
@ -215,6 +215,21 @@
|
|||||||
color: #6c757d;
|
color: #6c757d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------------------------------------------------------ */
|
||||||
|
/* -- Toast -- */
|
||||||
|
/* ------------------------------------------------------------------------------------------------------------------ */
|
||||||
|
.toast {
|
||||||
|
position: absolute;
|
||||||
|
top: 5px;
|
||||||
|
right: -250px;
|
||||||
|
width: 250px;
|
||||||
|
min-height: 50px;
|
||||||
|
z-index: 1000;
|
||||||
|
transform: translateX(-280px);
|
||||||
|
transition: transform 2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------------------------------------------------------ */
|
||||||
/* -- Footer -- */
|
/* -- Footer -- */
|
||||||
/* ------------------------------------------------------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------------------------------------------------------ */
|
||||||
|
|||||||
@ -3,6 +3,10 @@ const TABLE_CLASS = '.data-table';
|
|||||||
const TABLE_CLASS_NO_PAGING = '.data-table-npaging';
|
const TABLE_CLASS_NO_PAGING = '.data-table-npaging';
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
// Bottstrap Toast
|
||||||
|
$('.toast').toast('show');
|
||||||
|
|
||||||
|
//Datatables
|
||||||
const data_table = $(TABLE_CLASS).DataTable({
|
const data_table = $(TABLE_CLASS).DataTable({
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"pageLength": 10,
|
"pageLength": 10,
|
||||||
|
|||||||
@ -65,6 +65,7 @@
|
|||||||
<script src="{{ static('libs/DataTables/DataTables-1.10.18/js/jquery.dataTables.js') }}"></script>
|
<script src="{{ static('libs/DataTables/DataTables-1.10.18/js/jquery.dataTables.js') }}"></script>
|
||||||
<script src="{{ static('libs/DataTables/RowReorder-1.2.4/js/dataTables.rowReorder.min.js') }}"></script>
|
<script src="{{ static('libs/DataTables/RowReorder-1.2.4/js/dataTables.rowReorder.min.js') }}"></script>
|
||||||
<script src="{{ static('libs/DataTables/Responsive-2.2.2/js/dataTables.responsive.min.js') }}"></script>
|
<script src="{{ static('libs/DataTables/Responsive-2.2.2/js/dataTables.responsive.min.js') }}"></script>
|
||||||
|
<script src="{{ static('libs/bootstrap-4.3.1-dist/js/bootstrap.min.js') }}"></script>
|
||||||
<script src="{{ static('js/main.js') }}"></script>
|
<script src="{{ static('js/main.js') }}"></script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -131,6 +131,19 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
|
{% macro get_success_toast(success_head, success_text) -%}
|
||||||
|
{% if success_text and success_head %}
|
||||||
|
<div class="toast" role="alert" aria-live="polite" aria-atomic="true" data-delay="5000">
|
||||||
|
<div role="alert" aria-live="assertive" aria-atomic="true">
|
||||||
|
<div role="alert" aria-live="assertive" aria-atomic="true" class="" data-autohide="false">
|
||||||
|
<div class="toast-header text-success"><strong class="mr-auto">{{ success_head }}</strong></div>
|
||||||
|
<div class="toast-body">{{ success_text }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro get_data_table_search_field(input_id="data-table-search-input") -%}
|
{% macro get_data_table_search_field(input_id="data-table-search-input") -%}
|
||||||
<div class="form-group w-25 float-right">
|
<div class="form-group w-25 float-right">
|
||||||
<input type="text"
|
<input type="text"
|
||||||
|
|||||||
@ -1,7 +1,9 @@
|
|||||||
{% extends 'realm/realm_detailed.jinja2' %}
|
{% extends 'realm/realm_detailed.jinja2' %}
|
||||||
{% import 'macros/form_macros.jinja2' as mform %}
|
{% import 'macros/form_macros.jinja2' as mform %}
|
||||||
|
{% import 'macros/utils_macros.jinja2' as mutils %}
|
||||||
|
|
||||||
{% block detail_content %}
|
{% block detail_content %}
|
||||||
|
{{ mutils.get_success_toast(success_headline, success_text) }}
|
||||||
{% if user.user %}
|
{% if user.user %}
|
||||||
{% if user.deleted_user.deletion_date %}
|
{% if user.deleted_user.deletion_date %}
|
||||||
<h3 class="text-danger">{{ user.user.username }}
|
<h3 class="text-danger">{{ user.user.username }}
|
||||||
|
|||||||
Reference in New Issue
Block a user