Skip to content
GitLab
Verified Commit 6f571cb6 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(fai) Fix LDAP failures when copy/pasting partition tables 

issue #6030
parent cbbaf600
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 5 deletions
+3 -5
fai/admin/fai/class_faiDiskEntry.inc
+ 2
− 3
View file @ 6f571cb6
...@@ -179,9 +179,8 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute ...@@ -179,9 +179,8 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
$old_cn = $this->value[$part['FAIpartitionNr']]['cn']; $old_cn = $this->value[$part['FAIpartitionNr']]['cn'];
$new_cn = $part['cn']; $new_cn = $part['cn'];
$lvmDevices = $this->plugin->lvmDevices; $lvmDevices = $this->plugin->lvmDevices;
if (isset($lvmDevices[$old_cn])) { if (($key = array_search($old_cn, $lvmDevices)) !== FALSE) {
unset($lvmDevices[$old_cn]); $lvmDevices[$key] = $new_cn;
$lvmDevices[$new_cn] = $new_cn;
$this->plugin->lvmDevices = $lvmDevices; $this->plugin->lvmDevices = $lvmDevices;
} }
} }
......
fai/admin/fai/class_faiPartitionTable.inc
+ 1
− 2
View file @ 6f571cb6
...@@ -195,8 +195,7 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute ...@@ -195,8 +195,7 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
// Transform potential lvm information // Transform potential lvm information
if (isset($subattrs['FAIlvmDevice'])) { if (isset($subattrs['FAIlvmDevice'])) {
for ($i = 0; $i < $subattrs['FAIlvmDevice']['count']; $i++) { for ($i = 0; $i < $subattrs['FAIlvmDevice']['count']; $i++) {
$name = $subattrs['FAIlvmDevice'][$i]; $diskInfos['FAIlvmDevice'][] = $subattrs['FAIlvmDevice'][$i];
$diskInfos['FAIlvmDevice'][$name] = $name;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment