[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7072] Merge 7058:7065 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7072] Merge 7058:7065 from trunk |
|
Date: |
Mon, 07 Mar 2011 12:07:03 +0000 |
Revision: 7072
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7072
Author: sigurdne
Date: 2011-03-07 12:07:02 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
Merge 7058:7065 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
branches/Version-1_0-branch/property/js/yahoo/generic.index.js
branches/Version-1_0-branch/property/js/yahoo/lookup.tenant.index.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/project.xsl
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
branches/Version-1_0-branch/property/templates/base/project_group_view.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -747,8 +747,8 @@
$project_group_object->get_location_info('project_group',false);
$project_group_data
= $project_group_object->read_single(array('id'=>
$data['project_group']));
$project_group['value_project_group_descr']
= $project_group_data['descr'];
+ $project_group['value_project_group_budget']
= $project_group_data['budget'];
}
-
return $project_group;
}
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -116,6 +116,7 @@
$uicols['descr'][] = lang('id');
$uicols['datatype'][] =
$this->location_info['id']['type'] == 'varchar' ? 'V' : 'I';
$uicols['sortable'][] = true;
+ $uicols['formatter'][] = '';
foreach($this->location_info['fields'] as $field)
{
@@ -124,6 +125,7 @@
$uicols['descr'][] =
$field['descr'];
$uicols['datatype'][] = 'V';
$uicols['sortable'][] =
isset($field['sortable']) && $field['sortable'] ? true : false;
+ $uicols['formatter'][] =
$field['type'] == 'int' ? 'FormatterRight' : '';
}
$custom_fields = false;
@@ -154,6 +156,7 @@
$uicols['statustext'][] =
$this->_db->f('statustext');
$uicols['datatype'][$i] =
$this->_db->f('datatype');
$uicols['attib_id'][$i] =
$this->_db->f('id');
+ $uicols['formatter'][$i] =
$this->_db->f('datatype') == 'I' ? 'FormatterRight' : '';
$cols_return_extra[]= array(
'name' =>
$this->_db->f('column_name'),
'datatype' =>
$this->_db->f('datatype'),
@@ -398,6 +401,12 @@
'name' =>
'descr',
'descr' =>
lang('descr'),
'type' =>
'varchar'
+ ),
+ array
+ (
+ 'name' =>
'budget',
+ 'descr' =>
lang('budget'),
+ 'type' => 'int'
)
),
'edit_msg' => lang('edit'),
Modified: branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -621,6 +621,14 @@
$receipt['error'][]=array('msg'=>lang('missing value for %1',
$field_info['descr']));
}
}
+
+ if ($field_info['type'] ==
'int')
+ {
+ if(
$values[$field_info['name']] && !ctype_digit($values[$field_info['name']]) )
+ {
+
$receipt['error'][]=array('msg'=> "{$field_info['descr']}: " . lang('Please
enter an integer !'));
+ }
+ }
}
if($values['id'] &&
$this->location_info['id']['type'] == 'int' && !ctype_digit($values['id']))
Modified: branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -2526,10 +2526,10 @@
}
$uicols = array (
- 'input_type' => array('text','text'),
- 'name' =>
array('id','descr'),
- 'formatter' => array('',''),
- 'descr' =>
array(lang('ID'),lang('Name'))
+ 'input_type' =>
array('text','text','text'),
+ 'name' =>
array('id','descr','budget'),
+ 'formatter' =>
array('','','FormatterRight'),
+ 'descr' =>
array(lang('ID'),lang('Name'),lang('budget'))
);
$project_group_list = array();
Modified: branches/Version-1_0-branch/property/js/yahoo/generic.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/generic.index.js
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/js/yahoo/generic.index.js
2011-03-07 12:07:02 UTC (rev 7072)
@@ -28,6 +28,13 @@
date_search : 0, //if search has link "Data search"
particular_done : "admin.uimainscreen.mainscreen"
}
+
+/********************************************************************************/
+ var FormatterRight = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<div align=\"right\">"+oData+"</div>";
+ }
+
/****************************************************************************************/
this.particular_setting = function()
{
Modified: branches/Version-1_0-branch/property/js/yahoo/lookup.tenant.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/lookup.tenant.index.js
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/js/yahoo/lookup.tenant.index.js
2011-03-07 12:07:02 UTC (rev 7072)
@@ -12,6 +12,13 @@
{order:0, name:'btn_search', funct:"onSearchClick"}
]
+/********************************************************************************/
+ var FormatterRight = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<div align=\"right\">"+oData+"</div>";
+ }
+
+
// define Text buttons
var textImput = [
{order:0, name:'query', id:'txt_query'}
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2011-03-07
12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2011-03-07
12:07:02 UTC (rev 7072)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.610';
+ $setup_info['property']['version'] = '0.9.17.611';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -1318,7 +1318,8 @@
'fm_project_group' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
- 'descr' => array('type' =>
'varchar','precision' => '255','nullable' => False)
+ 'descr' => array('type' =>
'varchar','precision' => '255','nullable' => False),
+ 'budget' => array('type' => 'int','precision'
=> '4','nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-03-07 12:07:02 UTC (rev 7072)
@@ -5067,7 +5067,26 @@
}
}
+ /**
+ * Update property version from 0.9.17.610 to 0.9.17.611
+ * Add budget to project group
+ *
+ */
+ $test[] = '0.9.17.610';
+ function property_upgrade0_9_17_610()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_project_group','budget',array('type'
=> 'int','precision' => 4,'nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.611';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
/**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
Modified: branches/Version-1_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project.xsl
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/templates/base/project.xsl
2011-03-07 12:07:02 UTC (rev 7072)
@@ -235,7 +235,6 @@
</xsl:otherwise>
</xsl:choose>
- <xsl:call-template
name="project_group_form"/>
<tr>
<td
valign="top">
<xsl:value-of select="lang_name"/>
@@ -443,6 +442,8 @@
</td>
</tr>
+ <xsl:call-template name="project_group_form"/>
+
<xsl:choose>
<xsl:when test="ecodimb_data!=''">
<xsl:call-template name="ecodimb_form"/>
Modified:
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-03-07 12:07:02 UTC (rev 7072)
@@ -4,7 +4,7 @@
<xsl:apply-templates select="project_group_data"/>
</xsl:template>
- <xsl:template match="project_group_data">
+ <xsl:template match="project_group_data" xmlns:php="http://php.net/xsl";>
<script type="text/javascript">
self.name="first_Window";
function project_group_lookup()
@@ -29,7 +29,28 @@
<xsl:value-of
select="lang_select_project_group_help"/>
</xsl:attribute>
</input>
+ <xsl:choose>
+ <xsl:when
test="value_project_group_budget != ''">
+ <xsl:value-of
select="php:function('lang', 'budget')" />
+ <xsl:text>: </xsl:text>
+ <xsl:value-of
select="value_project_group_budget"/>
+ </xsl:when>
+ </xsl:choose>
</td>
</tr>
-
+<!--
+ <xsl:choose>
+ <xsl:when test="value_project_group_budget != ''">
+ <tr>
+ <td>
+ </td>
+ <td valign="top">
+ <xsl:value-of
select="php:function('lang', 'budget')" />
+ <xsl:text>: </xsl:text>
+ <xsl:value-of
select="value_project_group_budget"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+-->
</xsl:template>
Modified:
branches/Version-1_0-branch/property/templates/base/project_group_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project_group_view.xsl
2011-03-07 12:04:24 UTC (rev 7071)
+++ branches/Version-1_0-branch/property/templates/base/project_group_view.xsl
2011-03-07 12:07:02 UTC (rev 7072)
@@ -4,7 +4,7 @@
<xsl:apply-templates select="project_group_data"/>
</xsl:template>
- <xsl:template match="project_group_data">
+ <xsl:template match="project_group_data" xmlns:php="http://php.net/xsl";>
<tr>
<td valign="top">
<xsl:value-of select="lang_project_group"/>
@@ -14,6 +14,13 @@
<xsl:text> [</xsl:text>
<xsl:value-of
select="value_project_group_descr"/>
<xsl:text>]</xsl:text>
+ <xsl:choose>
+ <xsl:when
test="value_project_group_budget != ''">
+ <xsl:value-of
select="php:function('lang', 'budget')" />
+ <xsl:text>: </xsl:text>
+ <xsl:value-of
select="value_project_group_budget"/>
+ </xsl:when>
+ </xsl:choose>
</td>
</tr>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7072] Merge 7058:7065 from trunk,
Sigurd Nes <=