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

Fix a Javascript bug when the new header is selected #6590

Merged
merged 2 commits into from
Sep 12, 2018

Conversation

callapa
Copy link
Contributor

@callapa callapa commented Sep 4, 2018

The new header does not have the same identifier (header-react). Creating a variable containing the header identifier based on the selected header version.

$centreon->user->get_id()
);
foreach($userFeatures as $feature) {
if($feature['name'] == 'Header' && $feature['enabled'] == 1) {
Copy link
Contributor

Choose a reason for hiding this comment

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

please add a space after the "foreach" and the "if" and split the line after the "&&" ->
'foreach ($userFeatures as $feature) {
'''' if ($feature['name'] == 'Header' &&
'''' '''' $feature['enabled'] == 1
'''' ) {
'''' ''' $headerVersion = (int) $feature['version'];
'''' }
'}

@sc979
Copy link
Contributor

sc979 commented Sep 5, 2018

I've corrected the PSR2 -> https://github.com/centreon/centreon/tree/2.8.x/doc/coding-style

callapa and others added 2 commits September 11, 2018 17:49
The new header does not have the same identifier (header-react). Creating a variable containing the header identifier based on the selected header version.
@adr-mo adr-mo force-pushed the MON-2797-fix-hostgroups-summary-with-new-header branch from 2f20206 to 4c7c052 Compare September 11, 2018 15:50
@adr-mo
Copy link
Contributor

adr-mo commented Sep 11, 2018

Notification received because I've force pushed the branch to rebase it on the latest 2.8.x commit

Validation can now start :)

@lgcosta
Copy link
Contributor

lgcosta commented Sep 11, 2018

@adr-mo, I've created a PR (https://github.com/centreon/centreon/pull/6593) that i am going to need to keep up with, from all these push's until "mature" to merge.
so i am trying to keep up with these changes in branch 2.8.x

@sc979
Copy link
Contributor

sc979 commented Sep 11, 2018

@lgcosta this PR is to correct a bug with the feature flipping new menu -> were hostgroups aren't displayed.

@lgcosta
Copy link
Contributor

lgcosta commented Sep 11, 2018

@sc979 yeah, i know. what i mean is that every merge in branch 2.8.x, I will need to resolve conflict in the PR i quoted. So I will have to keep following the evolution of this branch ;-)

@adr-mo
Copy link
Contributor

adr-mo commented Sep 12, 2018

ENV

validation done using docker images built from rebased branch MON‌-2797-fix-hostgroups-summary-with-new-header (id: 4c7c052)

Validation OK

Can now be merged on 2.8.x branch

@callapa callapa merged commit 43f128f into 2.8.x Sep 12, 2018
@callapa callapa deleted the MON-2797-fix-hostgroups-summary-with-new-header branch September 12, 2018 14:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants