[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6507] merge 6505:6506 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6507] merge 6505:6506 from trunk |
Date: |
Thu, 21 Oct 2010 12:31:41 +0000 |
Revision: 6507
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6507
Author: sigurdne
Date: 2010-10-21 12:31:41 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
merge 6505:6506 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506
Modified: branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2010-10-21 12:30:54 UTC (rev 6506)
+++ branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2010-10-21 12:31:41 UTC (rev 6507)
@@ -361,6 +361,23 @@
);
}
+ $jasper = execMethod('property.sojasper.read',
array('location_id' => $GLOBALS['phpgw']->locations->get_id('property',
$this->acl_location)));
+
+ foreach ($jasper as $report)
+ {
+ $datatable['rowactions']['action'][] = array(
+ 'my_name' =>
'edit',
+ 'text' =>
lang('open JasperReport %1 in new window', $report['title']),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+
(
+
'menuaction' =>
'property.uijasper.view',
+
'jasper_id'
=> $report['id'],
+
'target' =>
'_blank'
+
)),
+ 'parameters'
=> $parameters
+ );
+ }
+
if ($this->acl_delete)
{
$datatable['rowactions']['action'][] = array
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6507] merge 6505:6506 from trunk,
Sigurd Nes <=