|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/class.uidocument.inc.php, 1.3.2.4 |
| Date: | Wed, 10 Nov 2004 15:08:09 +0100 |
Update of /property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.uidocument.inc.php
date: 2004/11/10 14:08:09; author: sigurdne; state: Exp; lines: +16 -19
Log Message:
no message
=====================================================================
Index: property/inc/class.uidocument.inc.php
diff -u property/inc/class.uidocument.inc.php:1.3.2.3
property/inc/class.uidocument.inc.php:1.3.2.4
--- property/inc/class.uidocument.inc.php:1.3.2.3 Tue Nov 9 14:30:25 2004
+++ property/inc/class.uidocument.inc.php Wed Nov 10 14:08:09 2004
@@ -140,29 +140,31 @@
if($document_entry['query_location'][$uicols['name'][$k]])
{
-
$content[$j]['row'][$k]['statustext'] = lang('search');
-
$content[$j]['row'][$k]['text'] =
$document_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $document_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup . '&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id']);
+
+ $content[$j]['row'][]=
array(
+ 'statustext'
=> lang('search'),
+ 'text'
=> $document_entry[$uicols['name'][$k]],
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $document_entry['query_location'][$uicols['name'][$k]] . '&entity_id=' .
$document_entry['p_entity_id'] . '&cat_id=' . $document_entry['p_cat_id'])
+ );
}
else
{
-
$content[$j]['row'][$k]['value'] =
$document_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
+ $content[$j]['row'][]=
array(
+ 'value'
=> $document_entry[$uicols['name'][$k]],
+ 'name'
=> $uicols['name'][$k],
+ );
}
}
}
- if(!$lookup)
+ if($this->acl_read)
{
- if($this->acl_read)
- {
-
$content[$j]['row'][$k]['statustext'] = lang('view documents
for this location/entity');
- $content[$j]['row'][$k]['text']
= lang('documents');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id'] . '&doc_type=' . $this->doc_type);
- $k++;
-
- }
+ $content[$j]['row'][]= array(
+ 'statustext'
=> lang('view documents for this location/entity'),
+ 'text'
=> lang('documents'),
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id'] . '&doc_type=' . $this->doc_type)
+ );
}
$j++;
@@ -186,7 +188,6 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
'type_id'
=>$type_id,
'query'
=>$this->query,
-
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'doc_type'
=>$this->doc_type,
@@ -204,7 +205,6 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
'type_id'
=>$type_id,
'query'
=>$this->query,
-
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'doc_type'
=>$this->doc_type,
@@ -222,7 +222,6 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
'type_id'
=>$type_id,
'query'
=>$this->query,
-
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'doc_type'
=>$this->doc_type,
@@ -283,8 +282,6 @@
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&cat_id='
. $this->cat_id),
'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
- 'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
- 'lookup'
=> $lookup,
'links'
=> $links,
'allow_allrows'
=> false,
'start_record'
=> $this->start,
| [Prev in Thread] | Current Thread | [Next in Thread] |