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

:sparkles: feat(dhcp) Allow sorting by IP/Mac in DHCP configuration edition 

issue #3632
parent d466e248
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 15 additions and 3 deletions
+15 -3
dhcp/admin/dhcp/class_DhcpSectionsAttribute.inc
+ 15
− 3
View file @ 348d52e8
......@@ -26,6 +26,17 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
protected $subnet_expanded = FALSE;
protected $dhcpObjectCache = [];
function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = [], $acl = "")
{
parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
$this->setHeaders([
_('Object'),
_('IP'),
_('Mac'),
'',
]);
}
protected function getAttributeArrayValue ($key, $value)
{
$id = $this->getHtmlId();
......@@ -78,17 +89,18 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
$link = '  '.$subnetExpandImg.$link;
}
}
$ip = $dhcpObject->getOption('routers');
return [
['html' => $link],
['html' => $dhcpObject->getOption('routers')],
(($ip === NULL) ? '' : $ip),
''
];
}
} else {
return [
['html' => $link],
['html' => $dhcpObject->getStatement('fixed-address')],
['html' => preg_replace('/^[^ ]+ /', '', isset($dhcpObject->dhcpHWAddress) ? $dhcpObject->dhcpHWAddress : '')],
$dhcpObject->getStatement('fixed-address'),
preg_replace('/^[^ ]+ /', '', (isset($dhcpObject->dhcpHWAddress) ? $dhcpObject->dhcpHWAddress : '')),
];
}
}
......
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