mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-06 08:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #1167 : Fixes and code cleaning

Browse source
This commit is contained in:
Zacharie 2020-05-14 10:43:54 +02:00 • committed by plegall
parent df46475e1b
commit c4b38d1a41
5 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
admin/include/functions.php
View file

@ -2454,7 +2454,14 @@ SELECT name
return $groupname;
}
function delete_groups($group_ids) {
function delete_groups($group_ids)
{
if (count($group_ids) == 0)
{
trigger_error('There is no group to delete', E_USER_WARNING);
return false;
}
$group_id_string = implode(',', $group_ids);
@ -2462,7 +2469,7 @@ function delete_groups($group_ids) {
$query = '
DELETE
FROM '. GROUP_ACCESS_TABLE .'
WHERE group_id IN('. $group_id_string .')
WHERE group_id IN ('. $group_id_string .')
;';
pwg_query($query);
@ -2470,14 +2477,14 @@ DELETE
$query = '
DELETE
FROM '. USER_GROUP_TABLE .'
WHERE group_id IN('. $group_id_string .')
WHERE group_id IN ('. $group_id_string .')
;';
pwg_query($query);
$query = '
SELECT id, name
FROM `'. GROUPS_TABLE .'`
WHERE id IN('. $group_id_string .')
WHERE id IN ('. $group_id_string .')
;';
$group_list = query2array($query, 'id', 'name');
@ -2487,7 +2494,7 @@ SELECT id, name
$query = '
DELETE
FROM `'. GROUPS_TABLE .'`
WHERE id IN('. $group_id_string .')
WHERE id IN ('. $group_id_string .')
;';
pwg_query($query);

2
admin/themes/clear/theme.css
View file

@ -494,7 +494,7 @@ input:focus + .slider {
border-left:1px solid #e6e6e6;
}
.OrangeBackground{
.GroupBackgroudSelected{
background-color:#ffd7ad!important;
}

7
admin/themes/default/js/group_list.js
View file

@ -236,7 +236,7 @@ var toogleSelection = function(group_id, toggle) {
groupBox = $("#group-"+group_id);
if (toggle) {
groupBox.find(".Group-checkbox input").attr("checked", true);
groupBox.addClass("OrangeBackground");
groupBox.addClass("GroupBackgroudSelected");
groupBox.find(".icon-users-1").addClass("OrangeIcon");
groupBox.find(".group_number_users").addClass("OrangeFont");
@ -260,7 +260,7 @@ var toogleSelection = function(group_id, toggle) {
option.appendTo("#MergeOptionsChoices");
} else {
groupBox.find(".Group-checkbox input").attr("checked", false);
groupBox.removeClass("OrangeBackground");
groupBox.removeClass("GroupBackgroudSelected");
groupBox.find(".icon-users-1").removeClass("OrangeIcon");
groupBox.find(".group_number_users").removeClass("OrangeFont");
$(".DeleteGroupList div").each(function () {
@ -537,6 +537,8 @@ $('.ConfirmMergeButton').on("click", function() {
}))
})
toogleSelection(dest_grp, false)
$(".DeleteGroupList").html("");
$("#MergeOptionsChoices").html("");
$("#group-"+dest_grp + " .group_number_users").html("<i class='icon-spin6 animate-spin'> </i>");
jQuery.ajax({
@ -593,6 +595,7 @@ $('.ConfirmDeleteButton').on("click", function() {
backgroundDismiss: true,
});
})
});
/*-------
Manage User Part

2
admin/themes/roma/theme.css
View file

@ -508,7 +508,7 @@ input:focus + .slider {
border-left:1px solid #1a1a1a;
}
.OrangeBackground{
.GroupBackgroudSelected{
background-color:#f9852c!important;
}

13
include/ws_functions/pwg.groups.php
View file

@ -214,8 +214,7 @@ SELECT COUNT(*)
mass_inserts(
USER_GROUP_TABLE,
array('group_id', 'user_id'),
$inserts,
array('ignore'=>true)
$inserts
);
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@ -246,6 +245,7 @@ function ws_groups_merge($params, &$service) {
$all_groups = array_unique($all_groups);
$merge_group = array_diff($params['merge_group_id'], array($params['destination_group_id']));
$merge_group_object = $service->invoke('pwg.groups.getList', array('group_id' => $params['merge_group_id']));
$query = '
SELECT COUNT(*)
@ -266,7 +266,7 @@ SELECT COUNT(*)
SELECT DISTINCT(user_id)
FROM `'. USER_GROUP_TABLE .'`
WHERE
group_id in ('.implode(',', $merge_group) .')
group_id IN ('.implode(',', $merge_group) .')
;';
$user_in_merge_groups = query2array($query, null, 'user_id');
@ -303,14 +303,17 @@ SELECT user_id
pwg_activity('group', $params['destination_group_id'], 'edit');
foreach ($user_to_add as $user_id)
{
pwg_activity('user', $user_id, 'edit');
pwg_activity('user', $user_id, 'edit', array("associated" => $params['destination_group_id']));
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
delete_groups($merge_group);
return $service->invoke('pwg.groups.getList', array('group_id' => $params['destination_group_id']));
return array(
"destination_group" => $service->invoke('pwg.groups.getList', array('group_id' => $params['destination_group_id'])),
"deleted_group" => $merge_group_object
);
}
/**