[Fmsystem-commits] [13990]

[Nelson Guerra]

Revision: 13990
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13990
Author:   nelson224
Date:     2015-09-23 00:21:10 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.uinotification.inc.php

Modified: branches/dev-syncromind/rental/inc/class.uinotification.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uinotification.inc.php     
2015-09-22 11:33:14 UTC (rev 13989)
+++ branches/dev-syncromind/rental/inc/class.uinotification.inc.php     
2015-09-23 00:21:10 UTC (rev 13990)
@@ -175,8 +175,21 @@
         */
        public function dismiss_notification()
        {
-               $notification_id = (int)phpgw::get_var('id');
-               return 
rental_soworkbench_notification::get_instance()->dismiss_notification($notification_id,strtotime('now'));
+               $list_notification_id = phpgw::get_var('id');
+               //$notification_id = (int)phpgw::get_var('id');
+               //$result = 
rental_soworkbench_notification::get_instance()->dismiss_notification($notification_id,strtotime('now'));
+               $message = array();
+               foreach ($list_notification_id as $notification_id)
+               {
+                       $result = 
rental_soworkbench_notification::get_instance()->dismiss_notification($notification_id,strtotime('now'));
+                       if ($result) {
+                               $message['message'][] = 
array('msg'=>'notification '.$notification_id.' '.lang('has been removed'));
+                       } else {
+                               $message['error'][] = 
array('msg'=>'notification '.$notification_id.' '.lang('not removed'));
+                       }                               
+               }
+               
+               return $message;
        }
        
        /**
@@ -192,14 +205,20 @@
                $notification_id = (int)phpgw::get_var('id');
                $contract_id = (int)phpgw::get_var('contract_id');
                $contract = 
rental_socontract::get_instance()->get_single($contract_id);
-                                       
+               
+               $message = array();
                if($contract->has_permission(PHPGW_ACL_EDIT))
                {
-                       
rental_soworkbench_notification::get_instance()->dismiss_notification_for_all($notification_id);
-                       return true;
+                       $result = 
rental_soworkbench_notification::get_instance()->dismiss_notification_for_all($notification_id);
+               
+                       if ($result) {
+                               $message['message'][] = 
array('msg'=>lang('notification been removed'));
+                       } else {
+                               $message['error'][] = 
array('msg'=>lang('notification not removed'));
+                       }
                }
-               return false;
                
+               return $message;
        }
 }
 ?>
\ No newline at end of file