[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.soadm...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.soadm... |
|
Date: |
Fri, 24 Mar 2006 19:30:21 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/24 19:30:21
Modified files:
inc : class.bocommon.inc.php
class.soadmin_entity.inc.php
class.soentity.inc.php class.uientity.inc.php
Log message:
no message
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bocommon.inc.php.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soadmin_entity.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soentity.inc.php.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uientity.inc.php.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: property/inc/class.bocommon.inc.php
diff -u property/inc/class.bocommon.inc.php:1.27
property/inc/class.bocommon.inc.php:1.28
--- property/inc/class.bocommon.inc.php:1.27 Mon Mar 20 10:13:38 2006
+++ property/inc/class.bocommon.inc.php Fri Mar 24 19:30:21 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.27 2006/03/20 10:13:38
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.28 2006/03/24 19:30:21
sigurdne Exp $
*/
/**
@@ -786,7 +786,8 @@
'LB' => 'Listbox',
'AB' => 'Contact',
'VENDOR' => 'Vendor',
- 'email' => 'Email'
+ 'email' => 'Email',
+ 'link' => 'Link'
);
$datatype = lang($datatype_text[$datatype]);
@@ -808,7 +809,8 @@
'LB' => 'int',
'AB' => 'int',
'VENDOR' => 'int',
- 'email' => 'varchar'
+ 'email' => 'varchar',
+ 'link' => 'varchar'
);
return $datatype_text[$datatype];
@@ -822,7 +824,8 @@
'LB' => 4,
'AB' => 4,
'VENDOR' => 4,
- 'email' => 64
+ 'email' => 64,
+ 'link' => 255
);
return $datatype_precision[$datatype];
@@ -1329,6 +1332,8 @@
$datatypes[10]['name']= lang('Vendor');
$datatypes[11]['id']= 'email';
$datatypes[11]['name']= lang('Email');
+ $datatypes[12]['id']= 'link';
+ $datatypes[12]['name']= lang('Link');
return $this->select_list($selected,$datatypes);
Index: property/inc/class.soadmin_entity.inc.php
diff -u property/inc/class.soadmin_entity.inc.php:1.17
property/inc/class.soadmin_entity.inc.php:1.18
--- property/inc/class.soadmin_entity.inc.php:1.17 Mon Mar 20 13:53:46 2006
+++ property/inc/class.soadmin_entity.inc.php Fri Mar 24 19:30:21 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin_entity.inc.php,v 1.17 2006/03/20 13:53:46
sigurdne Exp $
+ * @version $Id: class.soadmin_entity.inc.php,v 1.18 2006/03/24 19:30:21
sigurdne Exp $
*/
/**
@@ -955,13 +955,13 @@
$attrib['column_info']['precision']=64;
}
- $attrib['column_info']['type'] =
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
-
- if($attrib['column_info']['type']=='int' &&
!$attrib['column_info']['precision'])
+ if(!$attrib['column_info']['precision'])
{
- $attrib['column_info']['precision']=4;
+
$attrib['column_info']['precision']=$this->bocommon->translate_datatype_precision($attrib['column_info']['type']);
}
+ $attrib['column_info']['type'] =
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
+
if(!$attrib['column_info']['default'])
{
unset($attrib['column_info']['default']);
Index: property/inc/class.soentity.inc.php
diff -u property/inc/class.soentity.inc.php:1.16
property/inc/class.soentity.inc.php:1.17
--- property/inc/class.soentity.inc.php:1.16 Mon Feb 6 22:47:38 2006
+++ property/inc/class.soentity.inc.php Fri Mar 24 19:30:21 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.soentity.inc.php,v 1.16 2006/02/06 22:47:38
sigurdne Exp $
+ * @version $Id: class.soentity.inc.php,v 1.17 2006/03/24 19:30:21
sigurdne Exp $
*/
/**
@@ -177,7 +177,15 @@
$this->db->query("SELECT * FROM
fm_entity_attribute WHERE entity_id= $entity_id AND cat_id= $cat_id AND id=
$column_id");
$this->db->next_record();
- $uicols['input_type'][]
= 'text';
+
+ if($this->db->f('datatype') ==
'link')
+ {
+ $uicols['input_type'][]
= 'link';
+ }
+ else
+ {
+ $uicols['input_type'][]
= 'text';
+ }
$uicols['name'][]
= $this->db->f('column_name');
$uicols['descr'][]
= $this->db->f('input_text');
$uicols['statustext'][]
= $this->db->f('statustext');
Index: property/inc/class.uientity.inc.php
diff -u property/inc/class.uientity.inc.php:1.20
property/inc/class.uientity.inc.php:1.21
--- property/inc/class.uientity.inc.php:1.20 Tue Feb 7 08:31:08 2006
+++ property/inc/class.uientity.inc.php Fri Mar 24 19:30:21 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.uientity.inc.php,v 1.20 2006/02/07 08:31:08
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.21 2006/03/24 19:30:21
sigurdne Exp $
*/
/**
@@ -292,6 +292,13 @@
{
$content[$j]['row'][$i]['value'] =
$entity_entry[$uicols['name'][$i]];
$content[$j]['row'][$i]['name'] = $uicols['name'][$i];
+
if($uicols['input_type'][$i]=='link')
+ {
+
$content[$j]['row'][$i]['text'] = lang('link');
+
$content[$j]['row'][$i]['link'] =
$entity_entry[$uicols['name'][$i]];
+
$content[$j]['row'][$i]['target'] = '_blank';
+
+ }
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.soadm...,
Sigurd Nes <=