[Fmsystem-commits] [11148] property: feedback

[Sigurd Nes]

Revision: 11148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11148
Author:   sigurdne
Date:     2013-06-05 07:51:50 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
property: feedback

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

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2013-06-04 13:37:33 UTC 
(rev 11147)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2013-06-05 07:51:50 UTC 
(rev 11148)
@@ -1244,7 +1244,14 @@
                {
                        if(!$this->acl_delete)
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uilocation.stop', 'perm'=> 8, 'acl_location'=> $this->acl_location));
+                               if( phpgw::get_var('phpgw_return_as') == 'json' 
)
+                               {
+                                       return "Go away!";
+                               }
+                               else
+                               {
+                                       
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uilocation.stop', 'perm'=> 8, 'acl_location'=> $this->acl_location));
+                               }
                        }
 
                        $entity_id              = phpgw::get_var('entity_id', 
'int');