[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uigab.inc.php
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uigab.inc.php |
|
Date: |
Tue, 12 Sep 2006 07:33:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/12 07:33:22
Modified files:
inc : class.uigab.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uigab.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
Patches:
Index: class.uigab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.uigab.inc.php 5 Sep 2006 17:47:06 -0000 1.19
+++ class.uigab.inc.php 12 Sep 2006 07:33:22 -0000 1.20
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.uigab.inc.php,v 1.19 2006/09/05 17:47:06 sigurdne
Exp $
+ * @version $Id: class.uigab.inc.php,v 1.20 2006/09/12 07:33:22 sigurdne
Exp $
*/
/**
@@ -242,7 +242,7 @@
'feste_nr' =>
$value_feste_nr,
'seksjons_nr' =>
$value_seksjons_nr,
'location_code' =>
$gab['location_code'],
- 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.list_detail&gab_id='
. $gab['gab_id']),
+ 'link_view' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uigab.list_detail','gab_id'=>$gab['gab_id'])),
'lang_view_statustext' =>
$lang_view_statustext,
'text_view' =>
$text_view,
'link_map' =>
$link_to_map . '?maptype=Eiendomskart&gnr=' . (int)$value_gaards_nr . '&bnr=' .
(int)$value_bruks_nr . '&fnr=' . (int)$value_feste_nr,
@@ -360,7 +360,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
gab'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&from=index')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uigab.edit',
'from'=>'index'))
);
}
@@ -494,7 +494,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('view the gab');
$content[$j]['row'][$k]['text']
= lang('view');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.view&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.view', 'gab_id' => $gab_entry['gab_id'],
'location_code'=>$gab_entry['location_code']));
$k++;
}
@@ -502,7 +502,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('edit the gab');
$content[$j]['row'][$k]['text']
= lang('edit');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code'] .
'&from=list_detail');
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.edit', 'gab_id'=> $gab_entry['gab_id'],
'location_code'=>$gab_entry['location_code'], 'from'=>'list_detail'));
$k++;
}
@@ -510,7 +510,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('delete the
gab');
$content[$j]['row'][$k]['text']
= lang('delete');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.delete&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.delete', 'gab_id'=> $gab_entry['gab_id'],
'location_code'=> $gab_entry['location_code']));
$k++;
}
}
@@ -614,7 +614,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
gab'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&from=list_detail&gab_id='
. $gab_id . '&new=true')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.edit', 'from' => 'list_detail', 'gab_id'=> $gab_id,
'new'=>true))
);
}
@@ -624,7 +624,7 @@
(
'lang_done' =>
lang('done'),
'lang_done_statustext' => lang('back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.index')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.index'))
);
$link_data = array
@@ -804,9 +804,11 @@
);
+
+ $done_data = array('menuaction'=>
$this->currentapp.'.uigab.'.$from);
if($from=='list_detail')
{
- $gab_done='&gab_id=' . $gab_id;
+ $done_data['gab_id'] = $gab_id;
}
$kommune_nr = substr($gab_id,0,4);
@@ -839,7 +841,7 @@
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.'.$from.$gab_done),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',$done_data),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -888,7 +890,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.delete&gab_id='
. $gab_id . '&location_code=' . $location_code),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.delete', 'gab_id'=> $gab_id,
'location_code'=>$location_code)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -956,7 +958,7 @@
'location_type'
=> $location_type,
'location_data'
=> $location_data,
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.list_detail&gab_id='
. $gab_id),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.list_detail','gab_id' => $gab_id)),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -964,7 +966,7 @@
'value_remark'
=> $values['remark'],
'lang_done_statustext' =>
lang('Back to the list'),
- 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&from=list_detail&gab_id='
. $gab_id . '&location_code=' . $location_code),
+ 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uigab.edit', 'from'=>'list_detail', 'gab_id'=> $gab_id,
'location_code'=> $location_code)),
'lang_edit_statustext'
=> lang('Edit this entry'),
'lang_edit'
=> lang('Edit')
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uigab.inc.php,
Sigurd Nes <=