[Fmsystem-commits] [8296] property: more on notification

[Sigurd Nes]

Revision: 8296
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8296
Author:   sigurdne
Date:     2011-12-14 22:51:41 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
property: more on notification

Modified Paths:
--------------
    trunk/property/inc/class.notify.inc.php

Property Changed:
----------------
    trunk/property/inc/class.notify.inc.php

Modified: trunk/property/inc/class.notify.inc.php
===================================================================
--- trunk/property/inc/class.notify.inc.php     2011-12-14 22:31:10 UTC (rev 
8295)
+++ trunk/property/inc/class.notify.inc.php     2011-12-14 22:51:41 UTC (rev 
8296)
@@ -3,7 +3,7 @@
        * phpGroupWare - property: a Facilities Management System.
        *
        * @author Sigurd Nes <address@hidden>
-       * @copyright Copyright (C) 2008 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @copyright Copyright (C) 2011 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package phpgroupware
@@ -28,7 +28,7 @@
         */
 
        /**
-        * interlink - handles information of relations of items across 
locations.
+        * Notify - handles notification to contacts related to items across 
locations.
         *
         * @package phpgroupware
         * @subpackage property
@@ -110,9 +110,11 @@
 
                        foreach ($values as &$entry)
                        {
-                               $entry['comms'] = 
execMethod('addressbook.boaddressbook.get_comm_contact_data',$entry['contact_id']);
+                               $comms = 
execMethod('addressbook.boaddressbook.get_comm_contact_data',$entry['contact_id']);
+                               $entry['email'] = 
$comms[$entry['contact_id']]['work email'];
+                               $entry['sms'] = 
$comms[$entry['contact_id']]['mobile (cell) phone'];                            
                        }
-_debug_array($values);
+//_debug_array($values);
                        return $values;
                }
 
@@ -153,9 +155,13 @@
                        (
                                'name'          => "{$count}",
                                'values'        =>      json_encode(array(      
array('key' => 'id','hidden' => true),
+                                                                               
        //              array('key' => 'email','hidden' => true),
+                                                                               
        //              array('key' => 'sms','hidden' => true),
                                                                                
                        array('key' => 
'contact_id','label'=>lang('id'),'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink_notify'),
                                                                                
                        array('key' => 'first_name','label'=>lang('first 
name'),'sortable'=>true,'resizeable'=>true),
                                                                                
                        array('key' => 'last_name','label'=>lang('last 
name'),'sortable'=>true,'resizeable'=>true),
+                                                                               
                        array('key' => 
'email','label'=>lang('email'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                        array('key' => 
'sms','label'=>'SMS','sortable'=>false,'resizeable'=>true),
                                                                                
                        array('key' => 
'notification_method','label'=>lang('method'),'sortable'=>true,'resizeable'=>true),
                                                                                
                        array('key' => 
'is_active','label'=>lang('active'),'sortable'=>true,'resizeable'=>true),
                                                                                
                        array('key' => 
'entry_date','label'=>lang('entry_date'),'sortable'=>true,'resizeable'=>true),
@@ -250,7 +256,7 @@
                        }
                }
 
-               function refresh_notify_contact()
+               protected function refresh_notify_contact()
                {
                        $location_id            = 
(int)phpgw::get_var('location_id', 'int');
                        $location_item_id       = 
(int)phpgw::get_var('location_item_id', 'int');
@@ -258,7 +264,7 @@
 
                        $location_info = 
$GLOBALS['phpgw']->locations->get_name($location_id);
 
-                       if( 
!$GLOBALS['phpgw']->acl->check($location_info['location'], PHPGW_ACL_READ, 
$location_info['appname']))
+                       if( 
!$GLOBALS['phpgw']->acl->check($location_info['location'], PHPGW_ACL_EDIT, 
$location_info['appname']))
                        {
                                return;
                        }
@@ -339,6 +345,4 @@
                        }
                        return $content;
                }
-
-
        }


Property changes on: trunk/property/inc/class.notify.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id