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

:ambulance: fix(gpg) Avoid showing GPG configuration warning too early 

issue #6022
parent 65aa36cf
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 6 additions and 2 deletions
+6 -2
gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
+ 6
− 2
View file @ 1cb05108
...@@ -60,6 +60,11 @@ class pgpKeySelect extends selectManagement ...@@ -60,6 +60,11 @@ class pgpKeySelect extends selectManagement
{ {
/* Set baseMode to FALSE */ /* Set baseMode to FALSE */
$this->listing = new managementListing($this, FALSE, $this->multiSelect); $this->listing = new managementListing($this, FALSE, $this->multiSelect);
$infos = objects::infos($this->objectTypes[0]);
if ($infos['ou'] == 'unknown') {
msg_dialog::display(_('Configuration error'), _('You need to configure GPG base dn through the addons section first'));
}
} }
public static function getPgpKeysOu (): string public static function getPgpKeysOu (): string
...@@ -74,8 +79,7 @@ class pgpKeySelect extends selectManagement ...@@ -74,8 +79,7 @@ class pgpKeySelect extends selectManagement
$pgpServerInfo['pgpBaseKeySpaceDN'][0] $pgpServerInfo['pgpBaseKeySpaceDN'][0]
); );
} else { } else {
msg_dialog::display(_('Configuration error'), _('You need to configure GPG base dn through the addons section first')); return 'unknown';
return '';
} }
} }
......
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