[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.boentity.inc.php inc/class.s...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.boentity.inc.php inc/class.s... |
|
Date: |
Wed, 18 Oct 2006 09:11:44 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/18 09:11:44
Modified files:
inc : class.boentity.inc.php
class.soadmin_entity.inc.php
class.soentity.inc.php
class.uiadmin_entity.inc.php
class.uientity.inc.php
setup : phpgw_en.lang phpgw_no.lang phpgw_no.lang_latin
setup.inc.php tables_current.inc.php
tables_update.inc.php
templates/base : admin_entity.xsl attributes_form.xsl entity.xsl
Log message:
Enable help for attributes and to disable fields - in case one wants to
calculate the value as a result of something
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boentity.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soentity.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang_latin?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/property/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/admin_entity.xsl?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/attributes_form.xsl?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/entity.xsl?cvsroot=phpgroupware&r1=1.9&r2=1.10
Patches:
Index: inc/class.boentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- inc/class.boentity.inc.php 6 Oct 2006 12:23:22 -0000 1.23
+++ inc/class.boentity.inc.php 18 Oct 2006 09:11:44 -0000 1.24
@@ -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.boentity.inc.php,v 1.23 2006/10/06 12:23:22
sigurdne Exp $
+ * @version $Id: class.boentity.inc.php,v 1.24 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -24,6 +24,8 @@
var $sort;
var $order;
var $cat_id;
+ var $allrows;
+ var $part_of_town_id;
var $public_functions = array
(
@@ -611,5 +613,9 @@
$historylog->delete_single_record($data['history_id']);
}
+ function read_attrib_help($data)
+ {
+ return $this->so->read_attrib_help($data);
+ }
}
?>
Index: inc/class.soadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- inc/class.soadmin_entity.inc.php 12 Oct 2006 09:09:27 -0000 1.24
+++ inc/class.soadmin_entity.inc.php 18 Oct 2006 09:11:44 -0000 1.25
@@ -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.24 2006/10/12 09:09:27
sigurdne Exp $
+ * @version $Id: class.soadmin_entity.inc.php,v 1.25 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -884,6 +884,8 @@
$attrib['list']
= $this->db->f('list');
$attrib['search']
= $this->db->f('search');
$attrib['history']
= $this->db->f('history');
+ $attrib['disabled']
= $this->db->f('disabled');
+ $attrib['helpmsg']
= $this->db->f('helpmsg');
if($this->db->f('datatype')=='R' ||
$this->db->f('datatype')=='CH' || $this->db->f('datatype')=='LB')
{
$attrib['choice'] =
$this->read_attrib_choice($entity_id,$cat_id,$id);
@@ -915,6 +917,7 @@
$attrib['column_name'] =
$this->db->db_addslashes($attrib['column_name']);
$attrib['input_text'] =
$this->db->db_addslashes($attrib['input_text']);
$attrib['statustext'] =
$this->db->db_addslashes($attrib['statustext']);
+ $attrib['helpmsg'] =
$this->db->db_addslashes($attrib['helpmsg']);
$attrib['default'] =
$this->db->db_addslashes($attrib['default']);
$attrib['id'] =
$this->bocommon->next_id('fm_entity_attribute',array('entity_id'=>$attrib['entity_id'],'cat_id'=>$attrib['cat_id']));
@@ -943,6 +946,8 @@
$attrib['search'],
$attrib['list'],
$attrib['history'],
+ $attrib['disabled'],
+ $attrib['helpmsg'],
$attrib_sort,
$attrib['column_info']['type'],
$attrib['column_info']['precision'],
@@ -955,7 +960,7 @@
$this->db->transaction_begin();
- $this->db->query("INSERT INTO fm_entity_attribute
(entity_id,cat_id,id,column_name, input_text,
statustext,search,list,history,attrib_sort,
datatype,precision_,scale,default_value,nullable) "
+ $this->db->query("INSERT INTO fm_entity_attribute
(entity_id,cat_id,id,column_name, input_text,
statustext,search,list,history,disabled,helpmsg,attrib_sort,
datatype,precision_,scale,default_value,nullable) "
. "VALUES ($values)",__LINE__,__FILE__);
$receipt['id']= $attrib['id'];
@@ -1017,6 +1022,7 @@
$attrib['column_name'] =
$this->db->db_addslashes($attrib['column_name']);
$attrib['input_text'] =
$this->db->db_addslashes($attrib['input_text']);
$attrib['statustext'] =
$this->db->db_addslashes($attrib['statustext']);
+ $attrib['helpmsg'] =
$this->db->db_addslashes($attrib['helpmsg']);
$attrib['column_info']['default'] =
$this->db->db_addslashes($attrib['column_info']['default']);
if($attrib['column_info']['type']=='R' ||
$attrib['column_info']['type']== 'CH' || $attrib['column_info']['type'] =='LB'
|| $attrib['column_info']['type'] =='AB' || $attrib['column_info']['type']
=='VENDOR')
@@ -1046,6 +1052,8 @@
'list' =>
(isset($attrib['list'])?$attrib['list']:''),
'history' =>
(isset($attrib['history'])?$attrib['history']:''),
'nullable' =>
$attrib['column_info']['nullable'],
+ 'disabled' =>
(isset($attrib['disabled'])?$attrib['disabled']:''),
+ 'helpmsg' => $attrib['helpmsg'],
);
$value_set =
$this->bocommon->validate_db_update($value_set);
Index: inc/class.soentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.soentity.inc.php 17 Oct 2006 13:21:16 -0000 1.22
+++ inc/class.soentity.inc.php 18 Oct 2006 09:11:44 -0000 1.23
@@ -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.22 2006/10/17 13:21:16
sigurdne Exp $
+ * @version $Id: class.soentity.inc.php,v 1.23 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -428,7 +428,9 @@
// 'statustext' => str_replace("\n","
",stripslashes($this->db->f('statustext'))),
'datatype' =>
$this->db->f('datatype'),
'history' =>
$this->db->f('history'),
- 'allow_null' =>
$this->db->f('nullable')
+ 'allow_null' =>
$this->db->f('nullable'),
+ 'disabled' =>
$this->db->f('disabled'),
+ 'helpmsg' =>
!!$this->db->f('helpmsg')
);
}
//_debug_array($entity);
@@ -725,5 +727,21 @@
$this->db->query("DELETE FROM fm_origin WHERE
destination ='entity_" . $entity_id . '_' . $cat_id . "' AND
destination_id=$id",__LINE__,__FILE__);
$this->db->transaction_commit();
}
+
+ function read_attrib_help($data)
+ {
+ $entity_id =
(isset($data['entity_id'])?$data['entity_id']:'');
+ $cat_id = (isset($data['cat_id'])?$data['cat_id']:'');
+ $attrib_id =
(isset($data['attrib_id'])?$data['attrib_id']:'');
+
+ $this->db->query("SELECT helpmsg FROM
fm_entity_attribute WHERE entity_id ='$entity_id' AND cat_id ='$cat_id' AND id
= '$attrib_id'");
+
+ $this->db->next_record();
+// $helpmsg = str_replace("\n","
",stripslashes($this->db->f('helpmsg')));
+ $helpmsg = stripslashes($this->db->f('helpmsg'));
+ return $helpmsg;
+ }
+
+
}
?>
Index: inc/class.uiadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- inc/class.uiadmin_entity.inc.php 12 Oct 2006 09:09:27 -0000 1.24
+++ inc/class.uiadmin_entity.inc.php 18 Oct 2006 09:11:44 -0000 1.25
@@ -10,7 +10,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uiadmin_entity.inc.php,v 1.24 2006/10/12 09:09:27
sigurdne Exp $
+ * @version $Id: class.uiadmin_entity.inc.php,v 1.25 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -1276,6 +1276,14 @@
'value_history'
=> $values['history'],
'lang_history'
=> lang('history'),
'lang_history_statustext'
=> lang('Enable history for this attribute'),
+
+ 'value_disabled'
=> $values['disabled'],
+ 'lang_disabled'
=> lang('disabled'),
+ 'lang_disabled_statustext'
=> lang('This attribute turn up as disabled in the form'),
+
+ 'value_helpmsg'
=> $values['helpmsg'],
+ 'lang_helpmsg'
=> lang('help message'),
+ 'lang_helpmsg_statustext'
=> lang('Enables help message for this attribute'),
);
//_debug_array($values);
Index: inc/class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- inc/class.uientity.inc.php 7 Oct 2006 15:44:07 -0000 1.31
+++ inc/class.uientity.inc.php 18 Oct 2006 09:11:44 -0000 1.32
@@ -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.31 2006/10/07 15:44:07
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.32 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -38,7 +38,8 @@
'edit' => True,
'delete' => True,
'view_file' => True,
- 'attrib_history'=> True
+ 'attrib_history'=> True,
+ 'attrib_help' => True
);
function uientity()
@@ -1022,6 +1023,8 @@
'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
'lang_history_date_statustext' => lang('Enter
the date for this reading'),
'lang_date'
=> lang('date'),
+ 'help_url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.attrib_help', 'entity_id'=> $this->entity_id,
'cat_id'=> $this->cat_id)),
+ 'lang_help'
=> lang('help'),
);
$appname = $entity['name'];
@@ -1031,6 +1034,32 @@
// $GLOBALS['phpgw']->xslttpl->pp();
}
+ function attrib_help()
+ {
+ $GLOBALS['phpgw']->xslttpl->add_file(array('entity'));
+ $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+
+
+ $entity_id =
get_var('entity_id',array('POST','GET'));
+ $cat_id = get_var('cat_id',array('POST','GET'));
+ $attrib_id =
get_var('attrib_id',array('POST','GET'));
+
+ $data_lookup= array(
+ 'entity_id' => $entity_id,
+ 'cat_id' => $cat_id,
+ 'attrib_id' => $attrib_id
+ );
+
+ $help_msg =
$this->bo->read_attrib_help($data_lookup);
+
+ $attrib_data =
$this->boadmin_entity->read_single_attrib($entity_id,$cat_id,$attrib_id);
+ $appname = $attrib_data['input_text'];
+ $function_msg = lang('Help');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_help' => $help_msg));
+ }
+
function delete()
{
if(!$this->acl_delete)
Index: setup/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_en.lang,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- setup/phpgw_en.lang 12 Oct 2006 11:07:40 -0000 1.8
+++ setup/phpgw_en.lang 18 Oct 2006 09:11:44 -0000 1.9
@@ -424,6 +424,7 @@
Dima is missing from sub invoice in: property en Dima is missing
from sub invoice in:
directory created property en directory created
Disable property en Disable
+disabled property en disabled
District property en District
district_id property en district_id
Do not add this invoice property en Do not add this invoice
@@ -525,6 +526,7 @@
Edit Workorder property en Edit Workorder
edit/customise this hour property en edit/customise this hour
Email property en Email
+Enables help message for this attribute property en Enables
help message for this attribute
Enable property en Enable
Enable file upload property en Enable file upload
Enable history for this attribute property en Enable history
for this attribute
@@ -709,6 +711,7 @@
grouping property en grouping
Groups property en Groups
Helpdesk property en Helpdesk
+help message property en help message
Highest property en Highest
History property en History
History not allowed for this datatype property en History not
allowed for this datatype
@@ -1475,6 +1478,7 @@
This agreement group code is already registered! property en
This agreement group code is already registered!
This apartment ID does not exist! property en This apartment
ID does not exist!
This apartment is already registered! property en This apartment
is already registered!
+This attribute turn up as disabled in the form property en This
attribute turn up as disabled in the form
This Building ID does not exist! property en This Building
ID does not exist!
This building is already registered! property en This building
is already registered!
This Dim A is not valid: property en This Dim A is not valid:
Index: setup/phpgw_no.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- setup/phpgw_no.lang 12 Oct 2006 11:37:16 -0000 1.18
+++ setup/phpgw_no.lang 18 Oct 2006 09:11:44 -0000 1.19
@@ -422,6 +422,7 @@
Dim D property no Dim D
directory created property no katalog er opprettet
Disable property no Deaktiver
+disabled property no inaktivt
District property no Område
district_id property no Distrikt ID
Doc type property no Dokumenttype
@@ -522,6 +523,7 @@
Enable property no Aktiver
Enabled property no Aktiv
Enable file upload property no Aktiver opplasting av filer
+Enables help message for this attribute property no
Hjelpetekst for denne attributten
Enable history for this attribute property no Aktiver
historikk for denne attributten
Enable link from location detail property no Aktiver link
fra detaljer for areal
Enable start project from this category property no
Aktiviser mulighet for å starte prosjekt herfra
@@ -695,6 +697,7 @@
Groups property no Grupper
helpdesk property no Meldinger
Helpdesk property no Meldinger
+help message property no hjelpetekst
Highest property no Høyest
History property no Historikk
History not allowed for this datatype property no Historikk er
ikke tilgjengelig for denne datatypen
@@ -1436,6 +1439,7 @@
This agreement group code is already registered! property no
Denne avtale-gruppe-koden er allerede registert!
This apartment_id ID does not exist! property no Denne leilighet
ID eksisterer ikke
This apartment is already registered! property no denne
leiligheten er allrerede registert
+This attribute turn up as disabled in the form property no Denne
attributten vises som inaktivt i skjemaet
This Building ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building_id ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building is already registered! property no denne bygningen
er allrerede registert
Index: setup/phpgw_no.lang_latin
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang_latin,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_no.lang_latin 12 Oct 2006 11:37:16 -0000 1.3
+++ setup/phpgw_no.lang_latin 18 Oct 2006 09:11:44 -0000 1.4
@@ -422,6 +422,7 @@
Dim D property no Dim D
directory created property no katalog er opprettet
Disable property no Deaktiver
+disabled property no inaktivt
District property no Område
district_id property no Distrikt ID
Doc type property no Dokumenttype
@@ -522,6 +523,7 @@
Enable property no Aktiver
Enabled property no Aktiv
Enable file upload property no Aktiver opplasting av filer
+Enables help message for this attribute property no
Hjelpetekst for denne attributten
Enable history for this attribute property no Aktiver
historikk for denne attributten
Enable link from location detail property no Aktiver link
fra detaljer for areal
Enable start project from this category property no
Aktiviser mulighet for å starte prosjekt herfra
@@ -695,6 +697,7 @@
Groups property no Grupper
helpdesk property no Meldinger
Helpdesk property no Meldinger
+help message property no hjelpetekst
Highest property no Høyest
History property no Historikk
History not allowed for this datatype property no Historikk er
ikke tilgjengelig for denne datatypen
@@ -1436,6 +1439,7 @@
This agreement group code is already registered! property no
Denne avtale-gruppe-koden er allerede registert!
This apartment_id ID does not exist! property no Denne leilighet
ID eksisterer ikke
This apartment is already registered! property no denne
leiligheten er allrerede registert
+This attribute turn up as disabled in the form property no Denne
attributten vises som inaktivt i skjemaet
This Building ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building_id ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building is already registered! property no denne bygningen
er allrerede registert
Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- setup/setup.inc.php 14 Oct 2006 13:49:30 -0000 1.47
+++ setup/setup.inc.php 18 Oct 2006 09:11:44 -0000 1.48
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.47 2006/10/14 13:49:30 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.48 2006/10/18 09:11:44 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.526';
+ $setup_info['property']['version'] = '0.9.17.527';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Index: setup/tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- setup/tables_current.inc.php 12 Oct 2006 10:51:11 -0000 1.66
+++ setup/tables_current.inc.php 18 Oct 2006 09:11:44 -0000 1.67
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.66 2006/10/12 10:51:11
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.67 2006/10/18 09:11:44
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -1546,7 +1546,9 @@
'precision_' => array('type' =>
'int','precision' => '4','nullable' => True),
'scale' => array('type' => 'int','precision' =>
'4','nullable' => True),
'default_value' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'nullable' => array('type' =>
'varchar','precision' => '5','nullable' => True)
+ 'nullable' => array('type' =>
'varchar','precision' => '5','nullable' => True),
+ 'disabled' => array('type' => 'int','precision'
=> '4','nullable' => True),
+ 'helpmsg' => array('type' => 'text','nullable'
=> True)
),
'pk' => array('entity_id','cat_id','id'),
'fk' => array(),
Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- setup/tables_update.inc.php 12 Oct 2006 10:51:11 -0000 1.53
+++ setup/tables_update.inc.php 18 Oct 2006 09:11:44 -0000 1.54
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.53 2006/10/12 10:51:11
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.54 2006/10/18 09:11:44
sigurdne Exp $
*/
/**
@@ -1449,3 +1449,20 @@
$GLOBALS['setup_info']['property']['currentver'] = '0.9.17.526';
return $GLOBALS['setup_info']['property']['currentver'];
}
+
+ /**
+ * Update property version from 0.9.17.526 to 0.9.17.527
+ */
+
+ $test[] = '0.9.17.526';
+ function property_upgrade0_9_17_526()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_entity_attribute','disabled',
array('type' => 'int','precision' => '4','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_entity_attribute','helpmsg',
array('type' => 'text','nullable' => True));
+
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.527';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
Index: templates/base/admin_entity.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/admin_entity.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- templates/base/admin_entity.xsl 12 Oct 2006 10:51:11 -0000 1.6
+++ templates/base/admin_entity.xsl 18 Oct 2006 09:11:44 -0000 1.7
@@ -1,4 +1,4 @@
-<!-- $Id: admin_entity.xsl,v 1.6 2006/10/12 10:51:11 sigurdne Exp $ -->
+<!-- $Id: admin_entity.xsl,v 1.7 2006/10/18 09:11:44 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -1127,7 +1127,6 @@
</xsl:attribute>
<xsl:value-of
select="value_statustext"/>
</textarea>
-
</td>
</tr>
<tr>
@@ -1277,6 +1276,49 @@
</xsl:choose>
</td>
</tr>
+ <tr>
+ <td>
+ <xsl:value-of select="lang_disabled"/>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when
test="value_disabled = 1">
+ <input
type="checkbox" name="values[disabled]" value="1" checked="checked"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_disabled_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="checkbox" name="values[disabled]" value="1"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_disabled_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_helpmsg"/>
+ </td>
+ <td>
+ <textarea cols="60" rows="10"
name="values[helpmsg]" wrap="virtual" onMouseout="window.status='';return
true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_helpmsg_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_helpmsg"/>
+ </textarea>
+ </td>
+ </tr>
<xsl:choose>
<xsl:when test="multiple_choice != ''">
Index: templates/base/attributes_form.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/attributes_form.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/attributes_form.xsl 6 Oct 2006 12:23:22 -0000 1.4
+++ templates/base/attributes_form.xsl 18 Oct 2006 09:11:44 -0000 1.5
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_form.xsl,v 1.4 2006/10/06 12:23:22 sigurdne Exp $ -->
+<!-- $Id: attributes_form.xsl,v 1.5 2006/10/18 09:11:44 sigurdne Exp $ -->
<xsl:template name="attributes_form">
<xsl:apply-templates select="attributes_values"/>
@@ -23,6 +23,13 @@
<td class="{class}" align="left" valign="top">
<xsl:value-of select="input_text"/>
+
+ <xsl:choose>
+ <xsl:when test="helpmsg=1">
+ <xsl:variable
name="help_url"><xsl:value-of select="//help_url"/>&attrib_id=<xsl:value-of
select="attrib_id"/></xsl:variable>
+ <a
href="{$help_url}" target = "_blank"><xsl:text> [</xsl:text><xsl:value-of
select="//lang_help"/><xsl:text>]</xsl:text></a>
+ </xsl:when>
+ </xsl:choose>
<xsl:choose>
<xsl:when test="datatype='D'">
<xsl:text>[</xsl:text><xsl:value-of
select="//lang_dateformat"/><xsl:text>]</xsl:text>
@@ -47,6 +54,13 @@
</xsl:when>
<xsl:when
test="datatype='LB'">
<select
name="values_attribute[{counter}][value]" class="forms"
onMouseover="window.status='{statustext}'; return true;"
onMouseout="window.status='';return true;">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<option value=""><xsl:value-of select="//lang_none"/></option>
<xsl:for-each select="choice">
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
@@ -65,6 +79,13 @@
<xsl:variable name="contact_name"><xsl:value-of
select="name"/><xsl:text>_name</xsl:text></xsl:variable>
<xsl:variable name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
<input
type="text" name="{name}" value="{value}" onClick="{$lookup_function}"
readonly="readonly" size="5" onMouseout="window.status='';return true;" >
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -72,6 +93,13 @@
</xsl:attribute>
</input>
<input
size="30" type="text" name="{$contact_name}" value="{contact_name}"
onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -83,6 +111,13 @@
<xsl:variable name="vendor_name"><xsl:value-of
select="name"/><xsl:text>_org_name</xsl:text></xsl:variable>
<xsl:variable name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
<input
type="text" name="{name}" value="{value}" onClick="{$lookup_function}"
readonly="readonly" size="6" onMouseout="window.status='';return true;" >
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -90,6 +125,13 @@
</xsl:attribute>
</input>
<input
size="30" type="text" name="{$vendor_name}" value="{vendor_name}"
onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -99,6 +141,13 @@
</xsl:when>
<xsl:when
test="datatype='D'">
<input
type="text" name="values_attribute[{counter}][value]" value="{value}"
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}"
size="12" maxlength="10" onMouseout="window.status='';return true;" >
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -108,6 +157,13 @@
</xsl:when>
<xsl:when
test="datatype='T'">
<textarea cols="40" rows="6" name="values_attribute[{counter}][value]"
wrap="virtual" onMouseout="window.status='';return true;">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
@@ -118,6 +174,13 @@
</xsl:when>
<xsl:otherwise>
<input
type="text" name="values_attribute[{counter}][value]" value="{value}" size="30"
onMouseout="window.status='';return true;" >
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="statustext"/>
Index: templates/base/entity.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/entity.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- templates/base/entity.xsl 27 Sep 2006 10:51:08 -0000 1.9
+++ templates/base/entity.xsl 18 Oct 2006 09:11:44 -0000 1.10
@@ -1,4 +1,4 @@
-<!-- $Id: entity.xsl,v 1.9 2006/09/27 10:51:08 sigurdne Exp $ -->
+<!-- $Id: entity.xsl,v 1.10 2006/10/18 09:11:44 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -14,6 +14,9 @@
<xsl:when test="attrib_history">
<xsl:apply-templates select="attrib_history"/>
</xsl:when>
+ <xsl:when test="attrib_help">
+ <xsl:apply-templates select="attrib_help"/>
+ </xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="list"/>
</xsl:otherwise>
@@ -759,3 +762,19 @@
</tr>
</xsl:template>
+<!-- attrib_help -->
+ <xsl:template match="attrib_help">
+ <table width="100%" cellpadding="2" cellspacing="2"
align="center">
+ <tr>
+ <td align="left" width="100%">
+ <textarea cols="100" rows="50"
wrap="virtual">
+ <xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="//attrib_help"/>
+ </textarea>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.boentity.inc.php inc/class.s...,
Sigurd Nes <=