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

Add operand MySQL for the Widgets #6391

Closed
wants to merge 13 commits into from
Closed

Add operand MySQL for the Widgets #6391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f33c205
Merge pull request #10 from centreon/master
May 22, 2017
8f5fffc
Merge pull request #11 from centreon/master
Jun 27, 2017
d7f0f2a
Merge pull request #12 from centreon/master
Jul 11, 2017
fd0c5ac
Merge pull request #13 from centreon/master
Sep 6, 2017
40cfedf
Merge pull request #14 from centreon/master
Sep 22, 2017
b0198fd
Merge pull request #15 from centreon/master
Oct 4, 2017
3746830
Merge pull request #16 from centreon/master
Dec 28, 2017
d9504a4
Merge pull request #17 from centreon/master
Jan 22, 2018
e4edc56
Merge pull request #18 from centreon/master
Feb 9, 2018
71e1f8e
Merge pull request #19 from centreon/master
Jun 21, 2018
822d809
Add operand MySQL for the Widgets
Jun 21, 2018
bab0739
Remove 'IN' and 'NOT IN'
Jul 23, 2018
7304719
Merge branch 'master' into Add_Type_Filter_Compare
cgagnaire Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions www/class/centreonUtils.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ public static function operandToMysqlFormat($str)
case "notlike":
$result = "NOT LIKE";
break;
case "regex":
$result = "REGEXP";
break;
case "notregex":
$result = "NOT REGEXP";
break;
default:
$result = "";
break;
Expand Down
6 changes: 4 additions & 2 deletions www/class/centreonWidget/Params/Compare.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public function init($params)
"eq" => "=",
"ne" => "!=",
"like" => "LIKE",
"notlike" => "NOT LIKE"
"notlike" => "NOT LIKE",
"regex" => "REGEXP",
"notregex"=> "NOT REGEXP"
Copy link

Choose a reason for hiding this comment

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

ERROR: Expected at least 1 space before "=>"; 0 found

);
$elems[] = $this->quickform->addElement('select', 'op_' . $params['parameter_id'], '', $operands);
$elems[] = $this->quickform->addElement(
Expand All @@ -83,7 +85,7 @@ public function setValue($params)
$target = $params['default_value'];
}
if (isset($target)) {
if (preg_match("/(gt |lt |gte |lte |eq |ne |like |notlike )(.+)/", $target, $matches)) {
if (preg_match("/(gt |lt |gte |lte |eq |ne |like |notlike |regex |notregex )(.+)/", $target, $matches)) {
$op = trim($matches[1]);
$val = trim($matches[2]);
}
Expand Down