diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-25 08:59:24 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-25 08:59:24 +0000 |
| commit | 3caf8639ef40a9cbb42c9dad28e1324d3dff17ed (patch) | |
| tree | 2ecab7c53e7ed4339c49d21eb804cccdffa7457a /frontends/php/include/forms.inc.php | |
| parent | a4abbb8aafb7da9f50fa8716954a43a3961a9082 (diff) | |
| download | zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.tar.gz zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.tar.xz zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.zip | |
- dropped suport of delays between actions due to bad design (Alexei)
- fixed incorrect handling of actions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2904 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/forms.inc.php')
| -rw-r--r-- | frontends/php/include/forms.inc.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 266b062c..fef8ec7a 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -1071,7 +1071,6 @@ { $actiontype = $action["actiontype"]; $source = $action["source"]; - $delay = $action["delay"]; $uid = $action["userid"]; $subject = $action["subject"]; $message = $action["message"]; @@ -1112,7 +1111,6 @@ $source = get_request("source",0); $actiontype = get_request("actiontype",ACTION_TYPE_MESSAGE); - $delay = get_request("delay",30); $subject = get_request("subject","{TRIGGER.NAME}: {STATUS}"); $message = get_request("message","{TRIGGER.NAME}: {STATUS}"); $scope = get_request("scope",0); @@ -1280,9 +1278,9 @@ // end of new condition preparation $frmAction->AddRow(S_CONDITION, $rowCondition); - $frmAction->AddRow( +/* $frmAction->AddRow( $actiontype == ACTION_TYPE_MESSAGE ? S_DELAY_BETWEEN_MESSAGES_IN_SEC : S_DELAY_BETWEEN_EXECUTIONS_IN_SEC, - new CTextBox('delay',$delay,5)); + new CTextBox('delay',$delay,5));*/ if($actiontype == ACTION_TYPE_MESSAGE) { |