public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-01-08 01:18:25 +03:00
Code Issues Projects Releases Wiki Activity

Fixed wrong domain policy link deletion

Browse Source 
Domain policy links are correctly deleted from GUI now.
Before fix policies, linked to another OUs, were deleted (in GUI)
under not domain OU fetched items (bugfix #49385).
This commit is contained in:
Semyon Knyazev 2024-02-14 21:49:20 +04:00
parent 62869e4e84
commit b3ea81a70c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/admc/console_impls/policy_impl.cpp
View File

@ -195,8 +195,6 @@ void PolicyImpl::rename(const QList<QModelIndex> &index_list) {
}
void PolicyImpl::delete_action(const QList<QModelIndex> &index_list) {
UNUSED_ARG(index_list);
const QModelIndex parent_index = index_list[0].parent();
const ItemType parent_type = (ItemType) console_item_get_type(parent_index);
const bool parent_is_ou = (parent_type == ItemType_PolicyOU);
@ -548,7 +546,7 @@ void console_policy_remove_link(const QList<ConsoleWidget *> &console_list, Poli
const bool replace_success = ad.attribute_replace_string(ou_dn, ATTRIBUTE_GPLINK, gplink_new_string);
if (replace_success) {
auto apply_changes = [&ou_dn, &dn_list, policy_results](ConsoleWidget *target_console) {
auto apply_changes = [&ou_dn, &dn_list, &gplink_new_string, policy_results](ConsoleWidget *target_console) {
const QModelIndex policy_root = get_policy_tree_root(target_console);
// NOTE: there can be duplicate items for
@ -558,8 +556,10 @@ void console_policy_remove_link(const QList<ConsoleWidget *> &console_list, Poli
const QModelIndex ou_index = target_console->search_item(policy_root, PolicyOURole_DN, ou_dn, {ItemType_PolicyOU});
if (ou_index.isValid()) {
update_ou_item_gplink_data(gplink_new_string, ou_index, target_console);
for (const QString &dn : dn_list) {
const QModelIndex gpo_index = target_console->search_item(ou_index, PolicyRole_DN, dn, {ItemType_Policy});
const QModelIndex gpo_index = get_ou_child_policy_index(target_console, ou_index, dn);
target_console->delete_item(gpo_index);
}