tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop'

Browse Source 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
This commit is contained in:
Rafael Ameijeiras 2023-08-02 10:42:36 +00:00
commit e6eee88a63
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pandora_console/godmode/massive/massive_delete_profiles.php
View File

@ -67,8 +67,27 @@ if (is_ajax()) {
if ($get_users) { if ($get_users) {
$id_group = get_parameter('id_group'); $id_group = get_parameter('id_group');
$id_profile = get_parameter('id_profile'); $id_profile = get_parameter('id_profile');
$get_all_groups = get_parameter('get_all_groups', '0');
if ($get_all_groups !== '0') {
$profile_data = db_get_all_rows_sql(
'SELECT *
FROM tusuario_perfil
WHERE `id_perfil` = "'.$id_profile[0].'"
GROUP BY id_usuario'
);
} else {
if (strlen($id_profile[0]) > 0 && strlen($id_group[0]) > 0) {
$profile_data = db_get_all_rows_filter(
'tusuario_perfil',
[
'id_perfil' => $id_profile[0],
'id_grupo' => $id_group[0],
]
);
}
}
$profile_data = db_get_all_rows_filter('tusuario_perfil', ['id_perfil' => $id_profile[0], 'id_grupo' => $id_group[0]]);
if (!users_is_admin()) { if (!users_is_admin()) {
foreach ($profile_data as $user => $values) { foreach ($profile_data as $user => $values) {
if (users_is_admin($values['id_usuario'])) { if (users_is_admin($values['id_usuario'])) {
@ -243,6 +262,21 @@ $data[2] .= html_print_select(
); );
array_push($table->data, $data); array_push($table->data, $data);
$table->data[1][0] = '';
$table->data[1][1] = html_print_label_input_block(
__('Show all groups'),
html_print_checkbox_switch(
'get_all_groups',
1,
$get_all_groups,
true,
false,
'',
false,
' float-right'
),
['div_class' => 'center_align']
);
html_print_table($table); html_print_table($table);
@ -273,7 +307,8 @@ $(document).ready (function () {
{"page" : "godmode/massive/massive_delete_profiles", {"page" : "godmode/massive/massive_delete_profiles",
"get_users" : 1, "get_users" : 1,
"id_group[]" : $("#groups_id").val(), "id_group[]" : $("#groups_id").val(),
"id_profile[]" : $("#profiles_id").val() "id_profile[]" : $("#profiles_id").val(),
"get_all_groups" : $('#checkbox-get_all_groups').is(':checked') ? 1 : 0
}, },
function (data, status) { function (data, status) {
options = ""; options = "";
@ -295,6 +330,10 @@ $(document).ready (function () {
$("#profiles_id").change (function () { $("#profiles_id").change (function () {
update_users(); update_users();
}); });
$("#checkbox-get_all_groups").change (function () {
update_users();
});
}); });
/* ]]> */ /* ]]> */
</script> </script>

4
pandora_console/include/functions_html.php
View File

@ -4552,9 +4552,9 @@ function html_print_checkbox_switch_extended(
*/ */
function html_print_checkbox_switch($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false) function html_print_checkbox_switch($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false, $class='')
{ {
$output = html_print_checkbox_switch_extended($name, $value, (bool) $checked, $disabled, $script, '', true); $output = html_print_checkbox_switch_extended($name, $value, (bool) $checked, $disabled, $script, '', true, '', $class);
if (!$disabled_hidden) { if (!$disabled_hidden) {
$output .= html_print_input_hidden($name.'_sent', 1, true); $output .= html_print_input_hidden($name.'_sent', 1, true);
} }