- screens and actions will not be under control of templates (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@2476 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 4 insertions, 22 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2d323c1a..58c0cd35 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1559,16 +1559,16 @@ echo "</head>";
 	}
 
 	# Add host-template linkage
-	function add_template_linkage($hostid,$templateid,$items,$triggers,$actions,$graphs,$screens)
+	function add_template_linkage($hostid,$templateid,$items,$triggers,$graphs)
 	{
-		$sql="insert into hosts_templates (hostid,templateid,items,triggers,actions,graphs,screens) values ($hostid,$templateid,$items,$triggers,$actions,$graphs,$screens)";
+		$sql="insert into hosts_templates (hostid,templateid,items,triggers,graphs) values ($hostid,$templateid,$items,$triggers,$graphs)";
 		return	DBexecute($sql);
 	}
 
 	# Update host-template linkage
-	function update_template_linkage($hosttemplateid,$hostid,$templateid,$items,$triggers,$actions,$graphs,$screens)
+	function update_template_linkage($hosttemplateid,$hostid,$templateid,$items,$triggers,$graphs)
 	{
-		$sql="update hosts_templates set hostid=$hostid,templateid=$templateid,items=$items,triggers=$triggers,actions=$actions,graphs=$graphs,screens=$screens where hosttemplateid=$hosttemplateid";
+		$sql="update hosts_templates set hostid=$hostid,templateid=$templateid,items=$items,triggers=$triggers,graphs=$graphs where hosttemplateid=$hosttemplateid";
 		return	DBexecute($sql);
 	}
 
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 6b3e2492..9232b99d 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -38,9 +38,7 @@
 			$template=get_host_by_hostid($templateid);
 			$items=$row["items"];
 			$triggers=$row["triggers"];
-			$actions=$row["actions"];
 			$graphs=$row["graphs"];
-			$screens=$row["screens"];
 		}
 		else
 		{
@@ -48,9 +46,7 @@
 			$templateid=0;
 			$items=7;
 			$triggers=7;
-			$actions=7;
 			$graphs=7;
-			$screens=7;
 		}
 
 		$col=0;
@@ -103,26 +99,12 @@
 		echo "<input type=checkbox ".iif((4&$triggers)==4,"checked","")." name=\"triggers_delete\" \">".S_DELETE;
 
 		show_table2_v_delimiter($col++);
-		echo S_ACTIONS;
-		show_table2_h_delimiter();
-		echo "<input type=checkbox ".iif((1&$actions)==1,"checked","")." name=\"actions_add\" \">".S_ADD;
-		echo "<input type=checkbox ".iif((2&$actions)==2,"checked","")." name=\"actions_update\" \">".S_UPDATE;
-		echo "<input type=checkbox ".iif((4&$actions)==4,"checked","")." name=\"actions_delete\" \">".S_DELETE;
-
-		show_table2_v_delimiter($col++);
 		echo S_GRAPHS;
 		show_table2_h_delimiter();
 		echo "<input type=checkbox ".iif((1&$graphs)==1,"checked","")." name=\"graphs_add\" \">".S_ADD;
 		echo "<input type=checkbox ".iif((2&$graphs)==2,"checked","")." name=\"graphs_update\" \">".S_UPDATE;
 		echo "<input type=checkbox ".iif((4&$graphs)==4,"checked","")." name=\"graphs_delete\" \">".S_DELETE;
 
-		show_table2_v_delimiter($col++);
-		echo S_SCREENS;
-		show_table2_h_delimiter();
-		echo "<input type=checkbox ".iif((1&$screens)==1,"checked","")." name=\"screens_add\" \">".S_ADD;
-		echo "<input type=checkbox ".iif((2&$screens)==2,"checked","")." name=\"screens_update\" \">".S_UPDATE;
-		echo "<input type=checkbox ".iif((4&$screens)==4,"checked","")." name=\"screens_delete\" \">".S_DELETE;
-
 		show_table2_v_delimiter2($col++);
 		echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add linkage\">";
 		if(isset($hosttemplateid))