[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uis_agreement.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.uis_agreement.inc.php |
Date: |
Mon, 13 Aug 2007 13:23:45 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/08/13 13:23:45
Modified files:
inc : class.uis_agreement.inc.php
Log message:
update
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
Patches:
Index: class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.uis_agreement.inc.php 12 Aug 2007 21:25:10 -0000 1.44
+++ class.uis_agreement.inc.php 13 Aug 2007 13:23:45 -0000 1.45
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uis_agreement.inc.php,v 1.44 2007/08/12 21:25:10
sigurdne Exp $
+ * @version $Id: class.uis_agreement.inc.php,v 1.45 2007/08/13 13:23:45
sigurdne Exp $
*/
/**
@@ -434,11 +434,11 @@
}
}
- if($this->acl_read && !$edit_item &&
!$view_only)
+ if($this->acl_read)
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.view_item', 's_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.view_item', 's_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id'], 'from'=>
$view_only?'view':'edit'));
}
if($this->acl_edit && !$edit_item &&
!$view_only)
{
@@ -468,7 +468,7 @@
}
}
- if($this->acl_read && !$edit_item && !$view_only)
+ if($this->acl_read)
{
$table_header[$i]['width']
= '5%';
$table_header[$i]['align']
= 'center';
@@ -1204,6 +1204,8 @@
function view_item()
{
+ $from = get_var('from',array('POST','GET'));
+ $from = $from == 'edit'?'edit':'view';
$s_agreement_id =
get_var('s_agreement_id',array('POST','GET'));
$id = get_var('id',array('POST','GET'));
@@ -1216,7 +1218,7 @@
$link_data = array
(
- 'menuaction' =>
$this->currentapp.'.uis_agreement.edit',
+ 'menuaction' =>
$this->currentapp.'.uis_agreement.' . $from,
'id' => $s_agreement_id
);
- [Phpgroupware-cvs] property/inc class.uis_agreement.inc.php,
Sigurd Nes <=