[Phpgroupware-cvs] property/inc/class.uialarm.inc.php, 1.4.2.2

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.uialarm.inc.php

date: 2004/11/05 15:09:49;  author: sigurdne;  state: Exp;  lines: +8 -4

Log Message:
no message
=====================================================================
Index: property/inc/class.uialarm.inc.php
diff -u property/inc/class.uialarm.inc.php:1.4.2.1 
property/inc/class.uialarm.inc.php:1.4.2.2
--- property/inc/class.uialarm.inc.php:1.4.2.1  Fri Oct 29 18:45:17 2004
+++ property/inc/class.uialarm.inc.php  Fri Nov  5 15:09:49 2004
@@ -278,11 +278,15 @@
 
                function edit()
                {
+                       $method_id = get_var('method_id',array('POST'));
                        $async_id       = 
urldecode(get_var('async_id',array('POST','GET')));
                        $values         = get_var('values',array('POST'));
 
+                       $this->method_id = 
($method_id?$method_id:$this->method_id);
+
                        $GLOBALS['phpgw']->xslttpl->add_file(array('alarm'));
 
+//     _debug_array($async_id);
 
                        if ($values['save'] || $values['apply'])
                        {
@@ -318,7 +322,6 @@
                                        $data_set['event_id']           = 
$this->method_id;
 
 
-//     _debug_array($async);
                                        $receipt = 
$this->bo->save_alarm($alarm_type='fm_async',$entity_id=$this->method_id,$alarm=$data_set,$async['name']);
 
                                        if ($values['save'])
@@ -334,10 +337,11 @@
                                
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uialarm.index');
                        }
 
-                       if ($alarm_id)
+                       if ($async_id)
                        {
-                               $alarm = $this->bo->read_single($alarm_id);
-                               $this->cat_id = 
($alarm['cat_id']?$alarm['cat_id']:$this->cat_id);
+                               $alarm = 
$this->bo->read_alarm($alarm_type='fm_async',$async_id);
+                               $this->method_id = 
($alarm['event_id']?$alarm['event_id']:$this->method_id);
+
                        }
 
                        $link_data = array