|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/class.uiproject.inc.php, 1.9.2.2 |
| Date: | Tue, 9 Nov 2004 15:30:25 +0100 |
Update of /property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.uiproject.inc.php
date: 2004/11/09 14:30:25; author: sigurdne; state: Exp; lines: +36 -25
Log Message:
no message
=====================================================================
Index: property/inc/class.uiproject.inc.php
diff -u property/inc/class.uiproject.inc.php:1.9.2.1
property/inc/class.uiproject.inc.php:1.9.2.2
--- property/inc/class.uiproject.inc.php:1.9.2.1 Fri Oct 29 18:45:17 2004
+++ property/inc/class.uiproject.inc.php Tue Nov 9 14:30:25 2004
@@ -172,26 +172,34 @@
if($project_entry['query_location'][$uicols['name'][$k]])
{
-
$content[$j]['row'][$k]['statustext'] = lang('search');
-
$content[$j]['row'][$k]['text'] =
$project_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' . $lookup
. '&filter=' . $this->filter);
+
$content[$j]['row'][]= array(
+
'statustext' => lang('search'),
+ 'text'
=> $project_entry[$uicols['name'][$k]],
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' . $lookup
. '&filter=' . $this->filter)
+ );
}
else
{
-
$content[$j]['row'][$k]['value'] =
$project_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
+
$content[$j]['row'][]= array(
+ 'value'
=> $project_entry[$uicols['name'][$k]],
+ 'name'
=> $uicols['name'][$k]
+ );
}
}
elseif($uicols['input_type'][$k]=='link')
{
-
$content[$j]['row'][$k]['statustext'] = lang('search');
-
$content[$j]['row'][$k]['text'] =
$project_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $project_entry[$uicols['name'][$k]]);
+
$content[$j]['row'][]= array(
+ 'statustext'
=> lang('search'),
+ 'text'
=> $project_entry[$uicols['name'][$k]],
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $project_entry[$uicols['name'][$k]])
+ );
}
- if($lookup &&
$k==($count_uicols_name-2))
+ if($lookup &&
$k==($count_uicols_name-1))
{
-
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $project_entry['project_id']);
+ $content[$j]['row'][]=
array(
+ 'lookup_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $project_entry['project_id'])
+ );
}
}
@@ -199,38 +207,41 @@
{
if ($this->acl_read &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_READ))
{
-
$content[$j]['row'][$k]['statustext'] = lang('view the
project');
-
$content[$j]['row'][$k]['text'] = lang('view');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id']);
- $k++;
+ $content[$j]['row'][]=
array(
+ 'statustext'
=> lang('view the project'),
+ 'text'
=> lang('view'),
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id'])
+ );
}
else
{
-
$content[$j]['row'][$k++]['link']='dummy';
+ $content[$j]['row'][]=
array('link'=>'dummy');
}
if ($this->acl_edit &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_EDIT))
{
-
$content[$j]['row'][$k]['statustext'] = lang('edit the
project');
-
$content[$j]['row'][$k]['text'] = lang('edit');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id']);
- $k++;
+ $content[$j]['row'][]=
array(
+ 'statustext' =>
lang('edit the project'),
+ 'text'
=> lang('edit'),
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id'])
+ );
}
else
{
-
$content[$j]['row'][$k++]['link']='dummy';
+ $content[$j]['row'][]=
array('link'=>'dummy');
}
if ($this->acl_delete &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_DELETE))
{
-
$content[$j]['row'][$k]['statustext'] = lang('delete the
project');
-
$content[$j]['row'][$k]['text'] =
lang('delete');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_entry['project_id']);
- $k++;
+ $content[$j]['row'][]=
array(
+ 'statustext' =>
lang('delete the project'),
+ 'text'
=> lang('delete'),
+ 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_entry['project_id'])
+ );
}
else
{
-
$content[$j]['row'][$k++]['link']='dummy';
+ $content[$j]['row'][]=
array('link'=>'dummy');
}
}
| [Prev in Thread] | Current Thread | [Next in Thread] |