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

MON-3518-filter-correction-recurrent-downtime-form #6509

Merged
merged 3 commits into from
Mar 5, 2019

Conversation

sc979
Copy link
Contributor

@sc979 sc979 commented Aug 1, 2018

Resolve MON-3518 on 2.8.x
As I couldn't push a coding style commit, on jben94's branch.
I opened a new branch to add the required commit.

From jben94 PR ->
Link issue : #6501
Link to the first PR : #6504 closed / rebased on the master
Link to the second PR PR : #6506

@@ -46,6 +46,9 @@
if (isset($_POST['searchDT']) && $_POST['searchDT']) {
$search = $_POST['searchDT'];
$downtime->setSearch($search);
} elseif (isset($_GET['search']) && $_GET['search'] && !isset($_POST['searchDT'])) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you use search parameter ?
The good one is searchDT, so you can remove those lines.

@sc979 sc979 force-pushed the jben94-Fix-Pag-ReccurDowntime branch from 2fa9127 to 0f92657 Compare August 21, 2018 15:50
@adr-mo
Copy link
Contributor

adr-mo commented Feb 18, 2019

@sc979 Could you please change the base for the PR from 2.8.x to master/18.10.x and rebase the branch.

@sc979
Copy link
Contributor Author

sc979 commented Feb 18, 2019

no I can't. This PR is specific to the 2.8.x as we PEAR methods were replaced with PDOs'
This one need to be merged on the 2.8.x. I'll make another one adapted to the master !

@adr-mo
Copy link
Contributor

adr-mo commented Feb 18, 2019

@sc979 I guess this one can be transformed only for master and 18.10.x branches.

No more bugfixes will be merged on the 2.8.x except critical/blocking bugs and security fixes

@sc979
Copy link
Contributor Author

sc979 commented Feb 18, 2019

@adr-mo ok, I'll adapt it ASAP ;)

@lpinsivy
Copy link
Contributor

on 2.8.x too please

@lpinsivy lpinsivy added the status/in-backlog A dev will begin to work on your modifications soon label Feb 18, 2019
@sc979 sc979 force-pushed the jben94-Fix-Pag-ReccurDowntime branch from 0f92657 to 1d2fe75 Compare February 18, 2019 15:48
@sc979 sc979 changed the title fix(DT): filter correction for recurrent downtime form MON-3518-filter-correction-recurrent-downtime-form Feb 18, 2019
@sc979
Copy link
Contributor Author

sc979 commented Feb 19, 2019

the PR for the 18.10.x is here :
https://github.com/centreon/centreon/pull/7201

@sc979 sc979 force-pushed the jben94-Fix-Pag-ReccurDowntime branch from 1d2fe75 to acf90b6 Compare February 27, 2019 12:23
@adr-mo
Copy link
Contributor

adr-mo commented Mar 5, 2019

Validation ok for the 2.8.x it can now be merged.

@sc979 sc979 force-pushed the jben94-Fix-Pag-ReccurDowntime branch from acf90b6 to 1aef0bd Compare March 5, 2019 15:09
@sc979 sc979 merged commit 6b8be46 into 2.8.x Mar 5, 2019
@sc979 sc979 deleted the jben94-Fix-Pag-ReccurDowntime branch March 5, 2019 15:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area/monitoring kind/bug status/in-backlog A dev will begin to work on your modifications soon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants