[Fmsystem-commits] [15256]

[nelson . guerra]

Revision: 15256
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15256
Author:   nelson224
Date:     2016-06-04 00:32:53 +0000 (Sat, 04 Jun 2016)
Log Message:
-----------


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

Modified: 
branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2016-06-04 00:32:35 UTC (rev 15255)
+++ branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2016-06-04 00:32:53 UTC (rev 15256)
@@ -259,14 +259,18 @@
                        {
                                return $values;
                        }
-
+                       
+                       foreach($values as &$item)
+                       {       
+                               $item['name'] = '<a 
href="'.self::link(array('menuaction' => 
'property.uigeneric_document.view_file', 'file_id' => 
$item['id'])).'">'.$item['name'].'</a>';
+                               $item['link'] = self::link(array('menuaction' 
=> 'property.uigeneric_document.view', 'id' => $item['id']));
+                       }
+                       
                        $result_data = array('results' => $values);
 
                        $result_data['total_records'] = 
$this->bo->total_records;
                        $result_data['draw'] = $draw;
 
-                       array_walk($result_data['results'], array($this, 
'_add_links'), array('menuaction' => 'property.uigeneric_document.view'));
-
                        return $this->jquery_results($result_data);
                }
 
@@ -492,11 +496,16 @@
                                );                              
                        }
                        
+                       $vfs = CreateObject('phpgwapi.vfs');
+                       $file_info = $vfs->get_info($id);
+       
                        $data = array
                        (
                                'datatable_def' => $datatable_def,
                                'document' => $values,
                                'lang_coordinator' =>  lang('coordinator'),
+                               'link_file' =>  self::link(array('menuaction' 
=> 'property.uigeneric_document.view_file', 'file_id' => 
$file_info['file_id'])),
+                               'file_name' =>  $file_info['name'],
                                'categories' => array('options' => $categories),
                                'status_list' => array('options' => array('id' 
=> 1, 'name' => 'status_1')),
                                'editable' => $mode == 'edit',