diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-13 21:35:49 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-13 21:35:49 +0000 |
| commit | e5ace5611c956becbfaab1874cb1276b8922ce69 (patch) | |
| tree | 3a51cdd15d44559d39fe8c567db89c133870631d | |
| parent | 1f69048c2b2ce89df4e5e750a506f846108afcd1 (diff) | |
| download | zabbix-e5ace5611c956becbfaab1874cb1276b8922ce69.tar.gz zabbix-e5ace5611c956becbfaab1874cb1276b8922ce69.tar.xz zabbix-e5ace5611c956becbfaab1874cb1276b8922ce69.zip | |
- [DEV-108] GUI - Actions
git-svn-id: svn://svn.zabbix.com/trunk@5486 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | frontends/php/include/actions.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 6 | ||||
| -rw-r--r-- | frontends/php/include/discovery.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 3 |
5 files changed, 12 insertions, 4 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 6ce4792e..a2cf7435 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -668,7 +668,7 @@ include_once 'include/discovery.inc.php'; } break; case CONDITION_TYPE_DSTATUS: - if( S_UNKNOWN == discovery_status2str($value) ) + if( S_UNKNOWN == discovery_object_status2str($value) ) { error(S_INCORRECT_DISCOVERY_STATUS); return false; diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 1324b8a5..ad34beff 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -413,8 +413,10 @@ define('EVENTS_OPTION_ONLYTRUE_NOTACK', 4); // use 0 to disable define('EVENTS_OPTION_NOFALSEFORB', 5); // reserved for TRIGGERS_OPTION_NOFALSEFORB, to disable set TRIGGERS_OPTION_NOFALSEFORB to 0 - define('DOBJECT_STATUS_UP', 0); - define('DOBJECT_STATUS_DOWN', 1); + define('DOBJECT_STATUS_UP', 0); + define('DOBJECT_STATUS_DOWN', 1); + define('DOBJECT_STATUS_DISCOVER', 2); /* only for events, */ + define('DOBJECT_STATUS_LOST', 3); /* generated by discovery */ define('DRULE_STATUS_ACTIVE', 0); define('DRULE_STATUS_DISABLED', 1); diff --git a/frontends/php/include/discovery.inc.php b/frontends/php/include/discovery.inc.php index 05e8b4e0..10cd2565 100644 --- a/frontends/php/include/discovery.inc.php +++ b/frontends/php/include/discovery.inc.php @@ -118,6 +118,8 @@ { $str_stat[DOBJECT_STATUS_UP] = S_UP; $str_stat[DOBJECT_STATUS_DOWN] = S_DOWN; + $str_stat[DOBJECT_STATUS_DISCOVER] = S_DISCOVER; + $str_stat[DOBJECT_STATUS_LOST] = S_LOST; if(isset($str_stat[$status])) return $str_stat[$status]; diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index b79963d6..2c31539c 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -3162,7 +3162,8 @@ include_once 'include/discovery.inc.php'; break; case CONDITION_TYPE_DSTATUS: $cmbCondVal = new CComboBox('new_condition[value]'); - foreach(array(DOBJECT_STATUS_UP, DOBJECT_STATUS_DOWN) as $stat) + foreach(array(DOBJECT_STATUS_UP, DOBJECT_STATUS_DOWN, DOBJECT_STATUS_DISCOVER, + DOBJECT_STATUS_LOST) as $stat) $cmbCondVal->AddItem($stat,discovery_object_status2str($stat)); $rowCondition[] = $cmbCondVal; diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index e6488d23..d8e60225 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -83,6 +83,9 @@ 'S_STATUS_OF_DISCOVERY_BIG'=> 'STATUS OF DISCOVERY', 'S_STATUS_OF_DISCOVERY'=> 'Status of discovery', + 'S_DISCOVER'=> 'Discover', + 'S_LOST'=> 'Lost', + // httpdetails.php 'S_DETAILS_OF_SCENARIO'=> 'Details of scenario', 'S_DETAILS_OF_SCENARIO_BIG'=> 'DETAILS OF SCENARIO', |