From a9ccbc34f1b40b2088438911c7ae17616550e4cf Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 19 Apr 2010 13:22:07 +0000 Subject: [PATCH] Get rid of the 'divlist' git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17695 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../addons/goto/events/class_DaemonEvent.inc | 18 +++++++++--------- .../goto/events/class_DaemonEvent_notify.inc | 6 +++--- .../goto/addons/goto/events/target_list.tpl | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc index 1095b9f1d..6e56949ad 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc @@ -59,7 +59,7 @@ class DaemonEvent protected $mode = SCHEDULED_EVENT; // Default action is sheduled. /* Sub dialog hanlding */ - protected $target_divlist = NULL; // The divlist used by the target add dialog + protected $target_listing = NULL; // The listing used by the target add dialog protected $target_add_list_used = FALSE; // Indicates that the target add list was used. protected $time_select_used = FALSE; // Indicates that we have used the timestamp select boxes. protected $target_list_used = FALSE; // Target list was diaplayed? @@ -280,12 +280,12 @@ class DaemonEvent { $this->target_add_list_used = TRUE; - if($this->target_divlist == NULL){ - $this->target_divlist = new EventAddSystemDialog($this->config,$this); + if($this->target_listing == NULL){ + $this->target_listing = new EventAddSystemDialog($this->config,$this); } $smarty = get_smarty(); - $smarty->assign("divlist",$this->target_divlist->execute()); + $smarty->assign("listing",$this->target_listing->execute()); return($smarty->fetch(get_template_path('target_list.tpl', TRUE, dirname(__FILE__)))); } @@ -297,18 +297,18 @@ class DaemonEvent if(isset($_POST['open_target_list'])){ $this->target_add_list_used =TRUE; } - if($this->target_divlist != NULL){ - $this->target_divlist->save_object(); + if($this->target_listing != NULL){ + $this->target_listing->save_object(); } if($this->target_add_list_used){ if(isset($_POST['abort_target_dialog'])){ $this->target_add_list_used =FALSE; - $this->target_divlist = NULL; + $this->target_listing = NULL; } if(isset($_POST['save_target_dialog'])){ $this->target_add_list_used =FALSE; - $this->add_targets($this->target_divlist->get_selected_targets()); - $this->target_divlist = NULL; + $this->add_targets($this->target_listing->get_selected_targets()); + $this->target_listing = NULL; } } diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc index 3765b2f1b..68c21fe47 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc @@ -171,11 +171,11 @@ class DaemonEvent_notify extends DaemonEvent { $this->target_add_list_used = TRUE; - if($this->target_divlist == NULL){ - $this->target_divlist = new EventAddUserDialog($this->config,$this); + if($this->target_listing == NULL){ + $this->target_listing = new EventAddUserDialog($this->config,$this); } $smarty = get_smarty(); - $smarty->assign("divlist",$this->target_divlist->execute()); + $smarty->assign("listing",$this->target_listing->execute()); return($smarty->fetch(get_template_path('target_list.tpl', TRUE, dirname(__FILE__)))); } diff --git a/gosa-plugins/goto/addons/goto/events/target_list.tpl b/gosa-plugins/goto/addons/goto/events/target_list.tpl index 39b349cee..e8a4b23f0 100644 --- a/gosa-plugins/goto/addons/goto/events/target_list.tpl +++ b/gosa-plugins/goto/addons/goto/events/target_list.tpl @@ -1,4 +1,4 @@ -{$divlist} +{$listing}
-- 2.30.2