Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(UI): do not display gorgone options on central's form #8206

Merged
merged 6 commits into from
Dec 24, 2019
Merged

fix(UI): do not display gorgone options on central's form #8206

merged 6 commits into from
Dec 24, 2019

Conversation

sc979
Copy link
Contributor

@sc979 sc979 commented Dec 23, 2019

Pull Request Template

Description

1-
gorgone data shouldn't be displayed on the central poller configuration form.
This PR is intended to hide these options when the localhost parameter has been set.

Before :
image

After :
image

2-
Correct the error in the browser console (legacy)
image

Fixes # (VF MON-4509)

Type of change

  • Patch fixing an issue (non-breaking change)
  • New functionality (non-breaking change)
  • Breaking change (patch or feature) that might cause side effects breaking part of the Software
  • Updating documentation (missing information, typo...)

Target serie

  • 2.8.x
  • 18.10.x
  • 19.04.x
  • 19.10.x
  • 20.04.x (master)

How this pull request can be tested ?

check the sreenshots above

Checklist

Community contributors & Centreon team

  • I followed the coding style guidelines provided by Centreon
  • I have commented my code, especially new classes, functions or any legacy code modified. (docblock)
  • I have commented my code, especially hard-to-understand areas of the PR.
  • I have made corresponding changes to the documentation.
  • I have rebased my development branch on the base branch (master, maintenance).

Centreon team only

  • I have made sure that the unit tests related to the story are successful.
  • I have made sure that unit tests cover 80% of the code written for the story.
  • I have made sure that acceptance tests related to the story are successful (local and CI)

@sc979 sc979 self-assigned this Dec 23, 2019
sc979
sc979 commented Dec 23, 2019
View reviewed changes
www/include/configuration/configServers/formServers.ihtml
{/foreach}
{literal}}{/literal}{if not $smarty.foreach.engines.last},{/if}
{/foreach}
{literal}}{/literal}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing closing brace genrating an error since long time ago

sc979
sc979 commented Dec 23, 2019
View reviewed changes
www/include/configuration/configServers/formServers.ihtml
<td class="FormRowField"><img class="helpTooltip" name="gorgone_port"> {$form.gorgone_port.label}</td>
<td class="FormRowValue">{$form.gorgone_port.html}</td>
{/if}
<!-- specific gorgone fields for remote or poller -->
Copy link
Contributor Author

@sc979 sc979 Dec 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this file, only lines 45 to 65 were modified.
other lines are indentation correction and list_one/list_two consistency

sc979
sc979 commented Dec 23, 2019
View reviewed changes
www/include/configuration/configServers/formServers.php
@@ -234,8 +238,22 @@
$form->addElement('text', 'gorgone_port', _("Gorgone connection port"), $attrsText3);

$tab = array();
$tab[] = $form->createElement('radio', 'localhost', null, _("Yes"), '1');
$tab[] = $form->createElement('radio', 'localhost', null, _("No"), '0');
$tab[] = $form->createElement(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the onclick have been added to these two radio buttons

sc979
sc979 commented Dec 23, 2019
View reviewed changes
www/include/configuration/configServers/formServers.php
@@ -426,6 +444,18 @@

?>
<script type='text/javascript'>
// toggle gorgone port and communication mode fields
Copy link
Contributor Author

@sc979 sc979 Dec 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toggling method called by the localhost radio button

@sc979
Copy link
Contributor Author

sc979 commented Dec 23, 2019

As many lines were modified (indentation, camelcase naming, ...) I commented the modifications to ease the review

@sc979 sc979 merged commit 9fda764 into MON-gorgone-integration Dec 24, 2019
@sc979 sc979 deleted the MON-4509-update-only-for-remote-form branch December 24, 2019 09:29
sc979 added a commit that referenced this pull request Mar 18, 2020
@sc979 @loiclau
@callapa @bdauria @lpinsivy @kduret
enh(core): replace centcore with gorgoned (#8414)
985c8ba 
* enh(core): generate centreon gorgone configuration file (#8160)

* enh(core): add gorgone configuration file generation

* fix: folder paths

* fix(core): naming of file and field type

* enh(core): update configuration file to take in account last modif

* fix(core): correct path to private key

* enh(core): add nodes module

* enh(core): store stats in cache dir

* enh(core): enable broker stats collection

* enh(poller) Update poller form to manage gorgone (#8184)

* enh(gorgone) Update config form to manage gorgone options  (#8197)

* enh(chore) replace centcore by gorgone (#8172)

* remove centcore perl script (#8209)

* fix(UI): do not display gorgone options on central's form (#8206)

* fix(UI): do not display gorgone options on central

* remove duplicated code (#8215)

* enh(admin): adapt broker stats page to new folder tree (#8216)

* enh(core): update script to manage gorgone configuration file (#8229)

* enh: exception management

* enh(update): generate gorgone conf file on update

* fix(translation): avoid empty gettext translation

* enh(core): Add a yaml configuration loader (#8270)

* MON-4737 enh(core): split gorgone configuration in different files (#8276)

* enh(core): adapt upgrade script to latest modifications (#8284)

* adapt update script

* enh: add more check brefore trying to create the conf files

* fix: correct path in the template

* enh(core): update gorgone configuration files (#8293)

* update configuration location

* enh(gorgone): Added API to communicate with the Gorgone server (#8294)

* enh(install): fix default keys pathes (#8302)

* fix db name configuration template

* replace remote data folder

* fix rest api test

* enh(UI): Add nowrap style to badge class - from aladdinchan (#8314)

* fix(ui): Add hash:8 suffix to font files to avoid asset conflicts and optimize Webpack config (#8305)

* Mon 4640 remove deprecated engine fields (#8233)

* fix(CI): add new tests to clapi diff

* fix(core): source install (#8396)

* enh(core): add gorgone user and copy ssh keys

* fix(api): fix options retrieval issue (#8412)

* fix(core): manage the gorgone configuration files (#8400)

* fix(core): duplicate SSH key on source upgrade (#8421)

Co-authored-by: loiclau <loic.lau@gmail.com>
Co-authored-by: Colin Gagnaire <cgagnaire@centreon.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Bruno d'Auria <bdauria@centreon.com>
Co-authored-by: Matthieu Kermagoret <mkermagoret@centreon.com>
Co-authored-by: Laurent Pinsivy <lpinsivy@centreon.com>
Co-authored-by: Kevin Duret <duret.kevin@gmail.com>
Co-authored-by: Laurent Calvet <laurent@callapa.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cgagnaire cgagnaire cgagnaire approved these changes

@jdelpierre jdelpierre jdelpierre approved these changes

@adr-mo adr-mo Awaiting requested review from adr-mo

Assignees

@sc979 sc979

Labels
area/configuration kind/bug kind/experimental
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sc979 @jdelpierre @cgagnaire