diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-02-08 08:16:31 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-02-08 08:16:31 +0000 |
| commit | 359fe436c1406cdeb9be3ba2c4dedef1c2df0970 (patch) | |
| tree | ecec2d89ef60a04c58de6426cfb79b3debb20dde | |
| parent | 54ca60fa017264d28d31a556117d0f3de4ade28f (diff) | |
Minor fixes.
git-svn-id: svn://svn.zabbix.com/trunk@2627 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | frontends/php/triggers.php | 6 | ||||
| -rw-r--r-- | upgrades/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php index 36ae410b..b6f4eef7 100644 --- a/frontends/php/triggers.php +++ b/frontends/php/triggers.php @@ -326,9 +326,9 @@ if($row["priority"]==0) $priority=S_NOT_CLASSIFIED; elseif($row["priority"]==1) $priority=S_INFORMATION; elseif($row["priority"]==2) $priority=S_WARNING; - elseif($row["priority"]==3) $priority=array("value"=>S_AVERAGE,"class"=>"average"); - elseif($row["priority"]==4) $priority=array("value"=>S_HIGH,"class"=>"high"); - elseif($row["priority"]==5) $priority=array("value"=>S_DISASTER,"class"=>"disaster"); + elseif($row["priority"]==3) $priority=new CSPan(S_AVERAGE,"average"); + elseif($row["priority"]==4) $priority=new CSPan(S_HIGH,"high"); + elseif($row["priority"]==5) $priority=new CSPan(S_DISASTER,"disaster"); else $priority=$row["priority"]; if($row["status"] == TRIGGER_STATUS_DISABLED) diff --git a/upgrades/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql b/upgrades/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql index 09e328b2..264b69d4 100644 --- a/upgrades/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql +++ b/upgrades/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql @@ -1,4 +1,4 @@ --alter table sysmaps add label_location int(1) DEFAULT '0' NOT NULL; +alter table sysmaps add label_location int(1) DEFAULT '0' NOT NULL; alter table hosts drop network_errors; alter table hosts add errors_from int(4) DEFAULT '0' NOT NULL; |