[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uilocation.inc.php class.bol...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uilocation.inc.php class.bol... |
|
Date: |
Wed, 27 Dec 2006 20:39:10 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/12/27 20:39:10
Modified files:
inc : class.uilocation.inc.php
class.bolocation.inc.php
Log message:
js-links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
Patches:
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- class.uilocation.inc.php 27 Dec 2006 10:37:59 -0000 1.47
+++ class.uilocation.inc.php 27 Dec 2006 20:39:09 -0000 1.48
@@ -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.uilocation.inc.php,v 1.47 2006/12/27 10:37:59
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.48 2006/12/27 20:39:09
sigurdne Exp $
*/
/**
@@ -842,12 +842,10 @@
}
$lookup_functions[$m]['name'] =
'lookup_'. $attributes_values[$r]['name'] .'()';
- $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
-
'menuaction'=> $this->currentapp.'.uilookup.vendor',
-
'column'=> $attributes_values[$r]['name']
-
)
-
);
- $lookup_functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['link'] =
"menuaction:'" . $this->currentapp.".uilookup.vendor',"
+
. "column':" . $attributes_values[$r]['name'] . "'";
+
+ $lookup_functions[$m]['action'] =
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
@@ -885,12 +883,12 @@
{
for ($j=0;$j<count($functions);$j++)
{
- $lookup_functions .= 'function
' . $functions[$j]['name'] ."\n";
- $lookup_functions .= '{'."\r\n";
- $lookup_functions .= "var link
= '" . $functions[$j]['link'] ."';" . "\n";
- $lookup_functions .= 'link =
link.split("amp;").join("");' ."\n";
- $lookup_functions .=
$functions[$j]['action'] ."\n";
- $lookup_functions .= '}'."\r\n";
+ $lookup_functions .=
"\t".'function ' . $functions[$j]['name'] ."\n";
+ $lookup_functions .=
"\t".'{'."\n";
+ $lookup_functions .= "\t\tvar
oArgs = {" . $functions[$j]['link'] ."};" . "\n";
+ $lookup_functions .= "\t\tvar
strURL = phpGWLink('index.php', oArgs);\n";
+ $lookup_functions .=
"\t\t".$functions[$j]['action'] ."\n";
+ $lookup_functions .=
"\t".'}'."\n";
}
}
}
@@ -1056,7 +1054,7 @@
'dateformat_validate' =>
$dateformat_validate,
'onKeyUp'
=> $onKeyUp,
'onBlur'
=> $onBlur,
- 'street_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.street')),
+ 'street_link'
=> "menuaction:'" . $this->currentapp.".uilookup.street'",
'lang_street'
=> lang('Street'),
'lang_select_street_help' =>
lang('Select the street name'),
'lang_street_num_statustext' => lang('Enter
the street number'),
@@ -1064,7 +1062,7 @@
'value_street_name'
=> (isset($values['street_name'])?$values['street_name']:''),
'value_street_number' =>
(isset($values['street_number'])?$values['street_number']:''),
- 'tenant_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.tenant')),
+ 'tenant_link'
=> "menuaction:'" . $this->currentapp.".uilookup.tenant'",
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> (isset($values['tenant_id'])?$values['tenant_id']:''),
'value_last_name'
=> (isset($values['last_name'])?$values['last_name']:''),
@@ -1321,8 +1319,8 @@
$lookup_functions[$m]['name'] =
'lookup_'. $attributes_values[$r]['name'] .'()';
- $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor', 'column'=>
$attributes_values[$r]['name']));
- $lookup_functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['link'] =
"menuaction:'" . $this->currentapp.".uilookup.vendor',column:'" .
$attributes_values[$r]['name'] . "'";
+ $lookup_functions[$m]['action'] =
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- class.bolocation.inc.php 27 Dec 2006 10:37:59 -0000 1.28
+++ class.bolocation.inc.php 27 Dec 2006 20:39:10 -0000 1.29
@@ -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.bolocation.inc.php,v 1.28 2006/12/27 10:37:59
sigurdne Exp $
+ * @version $Id: class.bolocation.inc.php,v 1.29 2006/12/27 20:39:10
sigurdne Exp $
*/
/**
@@ -234,7 +234,7 @@
break;
}
- $location_link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index', 'lookup'=>1));
+ $location_link = "menuaction:'".
$this->currentapp.".uilocation.index',lookup:1";
$config = $this->soadmin_location->read_config('');
@@ -286,14 +286,14 @@
$location['location'][$i]['lookup_link']
= True;
$location['location'][$i]['readonly']
= True;
$lookup_functions[$i]['name']
= 'lookup_loc' . ($i+1) . '()';
- $lookup_functions[$i]['link']
= $location_link .'&type_id=' . ($i+1) .
'&lookup_name=' . $i;
- $lookup_functions[$i]['action']
=
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$i]['link']
= $location_link .',type_id:' . ($i+1) .
',lookup_name:' . $i;
+ $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
if(isset($data['no_link']) &&
$data['no_link']>=($i+3))
{
$location['location'][$i]['lookup_link'] = False;
- $lookup_functions[$i]['link']
= $location_link .'&type_id=' . ($data['no_link']-1) .
'&lookup_name=' . ($data['no_link']-2);
- $lookup_functions[$i]['action']
=
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$i]['link']
= $location_link .',type_id:' . ($data['no_link']-1) .
',lookup_name:' . ($data['no_link']-2);
+ $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$location['location'][$i]['statustext']
= lang('Klick this link to select') . ' ' .
$location_types[($data['no_link']-2)]['name'];
}
@@ -370,8 +370,8 @@
{
$m++;
$lookup_functions[$m]['name']
= 'lookup_loc' . ($m+1) . '()';
- $lookup_functions[$m]['link']
= $location_link
.'&lookup_tenant=1&type_id=' . $config[$j]['location_type'] . '&lookup_name=' .
$i;
- $lookup_functions[$m]['action']
=
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['link']
= $location_link
.',lookup_tenant:1,type_id:' . $config[$j]['location_type'] . ',lookup_name:' .
$i;
+ $lookup_functions[$m]['action']
=
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$location['location'][$i]['lookup_link'] = True;
$location['location'][$i]['name'] =
lang('Tenant');
@@ -437,8 +437,8 @@
$m++;
$lookup_functions[$m]['name'] =
'lookup_entity_' . $entity['id'] .'()';
- $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.entity', 'location_type'=>$data['type_id'],
'entity_id'=> $entity['id']));
- $lookup_functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['link'] =
"menuaction:'".
$this->currentapp.".uilookup.entity',location_type:".$data['type_id'] .
',entity_id:'. $entity['id'];
+ $lookup_functions[$m]['action'] =
'Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= 'entity_num_' . $entity['id'];
@@ -509,8 +509,8 @@
{
$location['lookup_functions'] .=
"\t".'function ' . $lookup_functions[$j]['name'] ."\n";
$location['lookup_functions'] .=
"\t".'{'."\n";
- $location['lookup_functions'] .=
"\t\tvar link = '" . $lookup_functions[$j]['link'] ."';" . "\n";
- $location['lookup_functions'] .=
"\t\t".'link = link.split("amp;").join("");' ."\n";
+ $location['lookup_functions'] .=
"\t\tvar oArgs = {" . $lookup_functions[$j]['link'] ."};" . "\n";
+ $location['lookup_functions'] .=
"\t\tvar strURL = phpGWLink('index.php', oArgs);\n";
$location['lookup_functions'] .=
"\t\t".$lookup_functions[$j]['action'] ."\n";
$location['lookup_functions'] .=
"\t".'}'."\n";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uilocation.inc.php class.bol...,
Sigurd Nes <=