diff options
| author | martinsj <martinsj@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-28 09:31:43 +0000 |
|---|---|---|
| committer | martinsj <martinsj@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-28 09:31:43 +0000 |
| commit | 55963f6c918d2503019875cac9307091b908eaaa (patch) | |
| tree | 49410302c25e4af4b9307a757c87c2683ddacb99 /frontends/php/include/forms.inc.php | |
| parent | 952ac65186915e1969ff6b5a6cf64c6c2df071cf (diff) | |
| download | zabbix-55963f6c918d2503019875cac9307091b908eaaa.tar.gz zabbix-55963f6c918d2503019875cac9307091b908eaaa.tar.xz zabbix-55963f6c918d2503019875cac9307091b908eaaa.zip | |
- fixed server hanging in calculation of aggregate functions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2785 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/forms.inc.php')
| -rw-r--r-- | frontends/php/include/forms.inc.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index e8cf46ec..b876bce4 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -1563,6 +1563,8 @@ $cmbRes->AddItem(SCREEN_RESOURCE_DATA_OVERVIEW, S_DATA_OVERVIEW); $cmbRes->AddItem(SCREEN_RESOURCE_CLOCK, S_CLOCK); $cmbRes->AddItem(SCREEN_RESOURCE_URL, S_URL); + $cmbRes->AddItem(SCREEN_RESOURCE_ACTIONS, S_HISTORY_OF_ACTIONS); + $cmbRes->AddItem(SCREEN_RESOURCE_EVENTS, S_HISTORY_OF_EVENTS); $form->AddRow(S_RESOURCE,$cmbRes); if($resource == SCREEN_RESOURCE_GRAPH) @@ -1638,6 +1640,18 @@ $form->AddRow(S_PARAMETER,$cmbHosts); $form->AddRow(S_SHOW_LINES, new CTextBox("elements",$elements,2)); } + elseif($resource == SCREEN_RESOURCE_ACTIONS) + { + // History of actions + $form->AddRow(S_SHOW_LINES, new CTextBox("elements",$elements,2)); + $form->AddVar("resourceid",0); + } + elseif($resource == SCREEN_RESOURCE_EVENTS) + { + // History of events + $form->AddRow(S_SHOW_LINES, new CTextBox("elements",$elements,2)); + $form->AddVar("resourceid",0); + } elseif(in_array($resource,array(SCREEN_RESOURCE_TRIGGERS_OVERVIEW,SCREEN_RESOURCE_DATA_OVERVIEW))) { // Overiews |