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

:ambulance: fix(opsi): Disable OPSI log fetching on templates 

It was triggerring errors and it makes no sense anyway

issue #5742
parent 6b5092c6
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 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 15 deletions
+21 -15
opsi/admin/systems/opsi/class_opsiLogView.inc
+ 21
− 15
View file @ 4614f4a1
...@@ -63,26 +63,29 @@ class opsiLogView extends simplePlugin ...@@ -63,26 +63,29 @@ class opsiLogView extends simplePlugin
if ($dn == '') { if ($dn == '') {
$dn = 'new'; $dn = 'new';
} }
parent::__construct($dn, $object, $parent, $mainTab);
/* Try to fetch logs for the given event (mac) */ parent::__construct($dn, $object, $parent, $mainTab);
$this->o_queue = new supportDaemon();
/* Get correct macAddress. Check if an event is given or a ldap object. */ if (!$this->is_template) {
if (isset($this->attrs['macAddress'][0])) { /* Try to fetch logs for the given event (mac) */
$this->mac = $this->attrs['macAddress'][0]; $this->o_queue = new supportDaemon();
}
if (isset($this->parent->by_object['opsiClient']) && $this->parent->by_object['opsiClient']->is_account && ($this->mac != '')) { /* Get correct macAddress. Check if an event is given or a ldap object. */
/* Query for log files */ if (isset($this->attrs['macAddress'][0])) {
$res = $this->o_queue->append_call('System.list_logs', $this->mac, array('args' => array())); $this->mac = $this->attrs['macAddress'][0];
if ($this->o_queue->is_error()) {
msg_dialog::display(_("Error"), $this->o_queue->get_error(), ERROR_DIALOG);
} }
/* Check if there is at least one log file */ if (isset($this->parent->by_object['opsiClient']) && $this->parent->by_object['opsiClient']->is_account && ($this->mac != '')) {
if (is_array($res)) { /* Query for log files */
$this->attributesAccess['available_logs']->setChoices($res); $res = $this->o_queue->append_call('System.list_logs', $this->mac, array('args' => array()));
if ($this->o_queue->is_error()) {
msg_dialog::display(_("Error"), $this->o_queue->get_error(), ERROR_DIALOG);
}
/* Check if there is at least one log file */
if (is_array($res)) {
$this->attributesAccess['available_logs']->setChoices($res);
}
} }
} }
...@@ -102,6 +105,9 @@ class opsiLogView extends simplePlugin ...@@ -102,6 +105,9 @@ class opsiLogView extends simplePlugin
function loadLog() function loadLog()
{ {
if ($this->is_template) {
return;
}
$res = $this->o_queue->append_call('System.get_log', $this->mac, array('args' => array($this->available_logs))); $res = $this->o_queue->append_call('System.get_log', $this->mac, array('args' => array($this->available_logs)));
if ($this->o_queue->is_error()) { if ($this->o_queue->is_error()) {
msg_dialog::display(_("Error"), $this->o_queue->get_error(), ERROR_DIALOG); msg_dialog::display(_("Error"), $this->o_queue->get_error(), 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