chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix titles in action links

Browse Source
pull/4020/head
Angel Fernando Quiroz Campos 4 years ago
parent c8e04d6552
commit da5a30d23b
2 changed files with 60 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      assets/js/app.js
  2. 73
      public/main/admin/user_list.php

2
assets/js/app.js
Unescape View File

@ -131,7 +131,7 @@ $(function () {
$('.delete-swal').click(function (e) { $('.delete-swal').click(function (e) {
e.preventDefault(); // Prevent the href from redirecting directly e.preventDefault(); // Prevent the href from redirecting directly
var url = $(this).attr("href"); var url = $(this).attr("href");
var title = $(this).attr("title"); var title = $(this).data('title') || $(this).attr("title");
Swal.fire({ Swal.fire({
title: title, title: title,

73
public/main/admin/user_list.php
Unescape View File

@ -662,15 +662,29 @@ function modify_filter($user_id, $url_params, $row)
!$user_is_anonymous && !$user_is_anonymous &&
api_global_admin_can_edit_admin($user_id) api_global_admin_can_edit_admin($user_id)
) { ) {
$result .= ' <a href="user_list.php?action=anonymize&user_id='.$user_id.'&'.$url_params.'&sec_token='.Security::getTokenFromSession().'" class="delete-swal" title="'.addslashes(api_htmlentities(get_lang("Please confirm your choice"))).'" >'. $anonymizeUrl = "user_list.php?$url_params&"
.http_build_query(
[
'action' => 'anonymize',
'user_id' => $user_id,
'sec_token' => Security::getTokenFromSession(),
]
);
$result .= Display::url(
Display::getMdiIcon( Display::getMdiIcon(
'incognito', 'incognito',
'ch-tool-icon', 'ch-tool-icon',
null, null,
22, ICON_SIZE_SMALL,
get_lang('Anonymize') get_lang('Anonymize')
). ),
'</a>'; $anonymizeUrl,
[
'data-title' => addslashes(api_htmlentities(get_lang("Please confirm your choice"))),
'class' => 'delete-swal',
'title' => get_lang('Anonymize'),
]
);
} }
$deleteAllowed = !api_get_configuration_value('deny_delete_users'); $deleteAllowed = !api_get_configuration_value('deny_delete_users');
@ -681,15 +695,29 @@ function modify_filter($user_id, $url_params, $row)
) { ) {
// you cannot lock yourself out otherwise you could disable all the accounts // you cannot lock yourself out otherwise you could disable all the accounts
// including your own => everybody is locked out and nobody can change it anymore. // including your own => everybody is locked out and nobody can change it anymore.
$result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.Security::getTokenFromSession().'" title="'.addslashes(api_htmlentities(get_lang("Please confirm your choice"))).'" class="delete-swal">'. $deleteUrl = "user_list.php?$url_params&"
.http_build_query(
[
'action' => 'delete_user',
'user_id' => $user_id,
'sec_token' => Security::getTokenFromSession(),
]
);
$result .= Display::url(
Display::getMdiIcon( Display::getMdiIcon(
'delete', 'delete',
'ch-tool-icon', 'ch-tool-icon',
null, null,
22, 22,
get_lang('Delete') get_lang('Delete')
). ),
'</a>'; $deleteUrl,
[
'data-title' => addslashes(api_htmlentities(get_lang("Please confirm your choice"))),
'title' => get_lang('Delete'),
'class' => 'delete-swal',
]
);
} else { } else {
$result .= Display::getMdiIcon( $result .= Display::getMdiIcon(
'delete', 'delete',
@ -710,15 +738,29 @@ function modify_filter($user_id, $url_params, $row)
api_global_admin_can_edit_admin($user_id, null, true) api_global_admin_can_edit_admin($user_id, null, true)
) { ) {
// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore. // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
$result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.Security::getTokenFromSession().'" title="'.addslashes(api_htmlentities(get_lang('Please confirm your choice'))).'" class="delete-swal">'. $deleteUrl = "user_list.php?$url_params&"
.http_build_query(
[
'action' => 'delete_user',
'user_id' => $user_id,
'sec_token' => Security::getTokenFromSession(),
]
);
$result .= Display::url(
Display::getMdiIcon( Display::getMdiIcon(
'delete', 'delete',
'ch-tool-icon', 'ch-tool-icon',
null, null,
22, ICON_SIZE_SMALL,
get_lang('Delete') get_lang('Delete')
). ),
'</a>'; $deleteUrl,
[
'data-title' => addslashes(api_htmlentities(get_lang("Please confirm your choice"))),
'title' => get_lang('Delete'),
'class' => 'delete-swal',
]
);
} }
} }
@ -748,7 +790,8 @@ function modify_filter($user_id, $url_params, $row)
22, 22,
get_lang('Assign users') get_lang('Assign users')
), ),
"dashboard_add_users_to_user.php?user={$user_id}" "dashboard_add_users_to_user.php?user={$user_id}",
['title' => get_lang('Assign users')]
); );
} }
@ -761,7 +804,8 @@ function modify_filter($user_id, $url_params, $row)
22, 22,
get_lang('Assign courses') get_lang('Assign courses')
), ),
"dashboard_add_courses_to_user.php?user={$user_id}" "dashboard_add_courses_to_user.php?user={$user_id}",
['title' => get_lang('Assign courses')]
); );
$result .= Display::url( $result .= Display::url(
@ -772,7 +816,8 @@ function modify_filter($user_id, $url_params, $row)
22, 22,
get_lang('Assign sessions') get_lang('Assign sessions')
), ),
"dashboard_add_sessions_to_user.php?user={$user_id}" "dashboard_add_sessions_to_user.php?user={$user_id}",
['title' => get_lang('Assign sessions')]
); );
} }
} }

Write Preview
Loading…
Cancel
Save