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

:ambulance: fix(ldapmanager) Show ACL errors in CSV import 

issue #5883
parent 7d1f502b
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 6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 3 deletions
+7 -3
ldapmanager/addons/ldapmanager/class_csvimport.inc
+ 7
− 3
View file @ 4b244f9d
...@@ -228,9 +228,13 @@ class csvimport extends simplePlugin ...@@ -228,9 +228,13 @@ class csvimport extends simplePlugin
$values[$m[1]][$m[2]] = $this->compute_attribute_value($attribute, $row); $values[$m[1]][$m[2]] = $this->compute_attribute_value($attribute, $row);
} }
$this->template_object->reset(); $this->template_object->reset();
$this->template_object->deserialize($values); $msgs = $this->template_object->deserialize($values);
$tabObject = $this->template_object->apply(); if ($msgs === TRUE) {
$msgs = $tabObject->save(); $tabObject = $this->template_object->apply();
$msgs = $tabObject->save();
} elseif (!is_array($msgs)) {
$msgs = array($msgs);
}
if (count($msgs)) { if (count($msgs)) {
$msg = '<ul><li>'.implode('</li><li>', $msgs).'</li></ul>'; $msg = '<ul><li>'.implode('</li><li>', $msgs).'</li></ul>';
msg_dialog::display(sprintf(_('Import failed for line %d'), $rownumber + 1), $msg, ERROR_DIALOG); msg_dialog::display(sprintf(_('Import failed for line %d'), $rownumber + 1), $msg, ERROR_DIALOG);
......
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