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

:ambulance: fix(webservice): Check if tab activation is disabled 

issue #4036
parent 88709b14
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 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 0 deletions
+9 -0
webservice/html/jsonrpc.php
+ 9
− 0
View file @ b554a98e
...@@ -283,6 +283,11 @@ class fdRPCService ...@@ -283,6 +283,11 @@ class fdRPCService
return array('errors' => array('Tab '.$tab.' is not activated on "'.$dn.'", can’t remove it')); return array('errors' => array('Tab '.$tab.' is not activated on "'.$dn.'", can’t remove it'));
} elseif (!$tabobject->by_object[$tab]->acl_is_removeable()) { } elseif (!$tabobject->by_object[$tab]->acl_is_removeable()) {
return array('errors' => array('You don\'t have sufficient rights to disable tab "'.$tab.'"')); return array('errors' => array('You don\'t have sufficient rights to disable tab "'.$tab.'"'));
} else {
list($disabled, $buttonText, $text) = $tabobject->by_object[$tab]->getDisplayHeaderInfos();
if ($disabled) {
return array('errors' => array($text));
}
} }
$_POST = array($tab.'_modify_state' => 1); $_POST = array($tab.'_modify_state' => 1);
$tabobject->save_object(); $tabobject->save_object();
...@@ -438,6 +443,10 @@ class fdRPCService ...@@ -438,6 +443,10 @@ class fdRPCService
$tabobject->by_object[$tab]->displayHeader && $tabobject->by_object[$tab]->displayHeader &&
!$tabobject->by_object[$tab]->is_account !$tabobject->by_object[$tab]->is_account
) { ) {
list($disabled, $buttonText, $text) = $tabobject->by_object[$tab]->getDisplayHeaderInfos();
if ($disabled) {
return array('errors' => array($text));
}
if ($tabobject->by_object[$tab]->acl_is_createable()) { if ($tabobject->by_object[$tab]->acl_is_createable()) {
$tabobject->by_object[$tab]->is_account = TRUE; $tabobject->by_object[$tab]->is_account = TRUE;
} else { } else {
......
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