[Fmsystem-commits] [15249]

[nelson . guerra]

Revision: 15249
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15249
Author:   nelson224
Date:     2016-06-02 02:23:42 +0000 (Thu, 02 Jun 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uilocation.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uilocation.inc.php     
2016-06-02 02:23:25 UTC (rev 15248)
+++ branches/dev-syncromind-2/property/inc/class.uilocation.inc.php     
2016-06-02 02:23:42 UTC (rev 15249)
@@ -1633,7 +1633,7 @@
                
                        foreach ($documents as $item) 
                        {
-                               $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uidocument.edit', 
'document_id'=>$item['document_id'])).'">'.$item['document_name'].'</a>';
+                               $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uidocument.view_file', 
'id'=>$item['document_id'])).'" target="_blank">'.$item['document_name'].'</a>';
                                $values[] =  array('document_name' => 
$document_name, 'title'=> $item['title']);
                        }
 
@@ -1645,7 +1645,7 @@
                        $documents2 = $generic_document->read($params);
                        foreach ($documents2 as $item) 
                        {
-                               $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uigeneric_document.edit', 
'id'=>$item['id'])).'">'.$item['name'].'</a>';
+                               $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uigeneric_document.view_file', 
'file_id'=>$item['id'])).'" target="_blank">'.$item['name'].'</a>';
                                $values[] =  array('document_name' => 
$document_name, 'title'=> $item['title']);
                        }
                        
@@ -2067,7 +2067,7 @@
                                                'container' => 
'datatable-container_0',
                                                'requestUrl' => 
json_encode(self::link(array('menuaction' => 
'property.uilocation.get_documents', 'location_code' => $location_code, 
'phpgw_return_as' => 'json'))),
                                                'data' => "",
-                                               'tabletools' => 
$documents_tabletools,
+                                               'tabletools' => ($mode == 
'edit') ? $documents_tabletools : array(),
                                                'ColumnDefs' => $documents_def,
                                                'config' => array(
                                                        array('disableFilter' 
=> true)