[Fmsystem-commits] [15760] property: link to docs

[sigurdne]

Revision: 15760
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15760
Author:   sigurdne
Date:     2016-09-29 13:29:50 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------
property: link to docs

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

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-09-29 13:28:52 UTC (rev 
15759)
+++ trunk/property/inc/class.uitts.inc.php      2016-09-29 13:29:50 UTC (rev 
15760)
@@ -763,6 +763,8 @@
 
                                $values_combo_box[4] = 
$this->_get_user_list($this->user_id);
 
+                               $filter_tts_assigned_to_me = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_assigned_to_me'];
+
                                array_unshift($values_combo_box[4], array(
                                        'id' => -1 * 
$GLOBALS['phpgw_info']['user']['account_id'],
                                        'name' => lang('my assigned tickets'),
@@ -970,15 +972,21 @@
 
                        $parameters = array
                                (
-                               'parameter' => array
-                                       (
-                                       array
-                                               (
+                               'parameter' => array(
+                                       array(
                                                'name' => 'id',
                                                'source' => 'id'
                                        ),
                                )
                        );
+                       $parameters_location = array(
+                               'parameter' => array(
+                                       array(
+                                               'name' => 'location_code',
+                                               'source' => 'location_code'
+                                       ),
+                               )
+                       );
 
                        $data['datatable']['actions'][] = array
                                (
@@ -999,12 +1007,11 @@
                                'action' => 
$GLOBALS['phpgw']->link('/index.php', array
                                        (
                                        'menuaction' => 'property.uitts._print',
-                                       'target' => '_blank'
                                )),
+                               'target' => '_blank',
                                'parameters' => json_encode($parameters)
                        );
 
-
                        $jasper = execMethod('property.sojasper.read', 
array('location_id' => $GLOBALS['phpgw']->locations->get_id('property', 
$this->acl_location)));
 
                        foreach ($jasper as $report)
@@ -1017,8 +1024,8 @@
                                                (
                                                'menuaction' => 
'property.uijasper.view',
                                                'jasper_id' => $report['id'],
-                                               'target' => '_blank'
                                        )),
+                                       'target' => '_blank',
                                        'parameters' => json_encode($parameters)
                                );
                        }
@@ -1038,6 +1045,18 @@
                                        'parameters' => json_encode($parameters)
                                );
                        }
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name' => 'docs',
+                               'statustext' => lang('documents'),
+                               'text' => lang('documents'),
+                               'action' => 
$GLOBALS['phpgw']->link('/index.php', array
+                                       (
+                                       'menuaction' => 
'property.uidocument.list_doc',
+                               )),
+                               'target' => '_blank',
+                               'parameters' => 
json_encode($parameters_location)
+                       );
 
                        if 
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'] == 
'yes' && $this->acl_edit)
                        {