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

:ambulance: fix(systems) Avoid crash in dashboard when argonaut plugin is not installed 

issue #5839
parent 88a9b4b5
dev 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 19 additions and 13 deletions
+19 -13
systems/addons/dashboard/class_dashBoardSystems.inc
+ 7
− 3
View file @ cda5aea1
...@@ -63,7 +63,7 @@ class dashboardSystems extends simplePlugin ...@@ -63,7 +63,7 @@ class dashboardSystems extends simplePlugin
$this->pc_ids = $this->computer_ids_rules(); $this->pc_ids = $this->computer_ids_rules();
} }
function systems_stats () protected function systems_stats ()
{ {
global $config; global $config;
$ldap = $config->get_ldap_link(); $ldap = $config->get_ldap_link();
...@@ -124,10 +124,14 @@ class dashboardSystems extends simplePlugin ...@@ -124,10 +124,14 @@ class dashboardSystems extends simplePlugin
return $stats; return $stats;
} }
function argonaut_stats () protected function argonaut_stats ()
{ {
global $config, $ui; global $config, $ui;
if (!class_available('argonautServer')) {
return FALSE;
}
$argonaut_servers = objects::ls( $argonaut_servers = objects::ls(
'server', 'server',
array('cn' => 'raw','ipHostNumber' => 'raw','argonautProtocol' => 'raw','argonautPort' => 'raw'), array('cn' => 'raw','ipHostNumber' => 'raw','argonautProtocol' => 'raw','argonautPort' => 'raw'),
...@@ -161,7 +165,7 @@ class dashboardSystems extends simplePlugin ...@@ -161,7 +165,7 @@ class dashboardSystems extends simplePlugin
); );
} }
function computer_ids_rules () protected function computer_ids_rules ()
{ {
global $config; global $config;
$ldap = $config->get_ldap_link(); $ldap = $config->get_ldap_link();
......
systems/addons/dashboard/systems_stats.tpl
+ 12
− 10
View file @ cda5aea1
...@@ -10,17 +10,19 @@ ...@@ -10,17 +10,19 @@
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
{if $attributes.stats.argonaut.nb_servers > 1} {if $attributes.stats.argonaut}
<img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t}There are several argonaut servers! (this is not yet supported){/t} {if $attributes.stats.argonaut.nb_servers > 1}
{elseif $attributes.stats.argonaut.nb_servers == 1} <img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t}There are several argonaut servers! (this is not yet supported){/t}
{t escape=none 1=$attributes.stats.argonaut.server.link 2=$attributes.stats.argonaut.server.ipHostNumber 3=$attributes.stats.argonaut.server.argonautProtocol 4=$attributes.stats.argonaut.server.argonautPort}There is an argonaut server running on %1 (%3://%2:%4){/t}<br/> {elseif $attributes.stats.argonaut.nb_servers == 1}
{if $attributes.stats.argonaut.nb_clients > 0} {t escape=none 1=$attributes.stats.argonaut.server.link 2=$attributes.stats.argonaut.server.ipHostNumber 3=$attributes.stats.argonaut.server.argonautProtocol 4=$attributes.stats.argonaut.server.argonautPort}There is an argonaut server running on %1 (%3://%2:%4){/t}<br/>
{t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client."}Only one system is configured to run an argonaut client.{/t}<br/> {if $attributes.stats.argonaut.nb_clients > 0}
{else} {t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client."}Only one system is configured to run an argonaut client.{/t}<br/>
{t}But no system is configured to run an argonaut client!{/t}<br/> {else}
{t}But no system is configured to run an argonaut client!{/t}<br/>
{/if}
{elseif $attributes.stats.argonaut.nb_clients > 0}
<img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client, but there is no argonaut server configured!"}A system is configured to run an argonaut client, but there is no argonaut server configured!{/t}<br/>
{/if} {/if}
{elseif $attributes.stats.argonaut.nb_clients > 0}
<img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client, but there is no argonaut server configured!"}A system is configured to run an argonaut client, but there is no argonaut server configured!{/t}<br/>
{/if} {/if}
</div> </div>
</div> </div>
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