[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15610] Syncromind: merge 15608:15609 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15610] Syncromind: merge 15608:15609 from trunk |
|
Date: |
Wed, 7 Sep 2016 18:36:59 +0000 (UTC) |
Revision: 15610
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15610
Author: sigurdne
Date: 2016-09-07 18:36:59 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
Syncromind: merge 15608:15609 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/rental/inc/class.uiapplication.inc.php
branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
branches/dev-syncromind-2/rental/setup/setup.inc.php
branches/dev-syncromind-2/rental/setup/tables_current.inc.php
branches/dev-syncromind-2/rental/setup/tables_update.inc.php
branches/dev-syncromind-2/rental/templates/base/application.xsl
Property Changed:
----------------
branches/dev-syncromind-2/
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609
Modified: branches/dev-syncromind-2/rental/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uiapplication.inc.php
2016-09-07 18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/inc/class.uiapplication.inc.php
2016-09-07 18:36:59 UTC (rev 15610)
@@ -267,10 +267,10 @@
);
}
- $composite_type = array();
+ $composite_types = array();
foreach ($this->composite_types as $_key => $_value)
{
- $composite_type[] = array('id' => $_key, 'name'
=> $_value);
+ $composite_types[] = array('id' => $_key,
'name' => $_value);
}
$payment_methods = array();
@@ -334,7 +334,7 @@
'attrib_name' => 'descr')
),
'district_list' => array('options' =>
$bocommon->select_district_list('', $application->district_id)),
- 'composite_type_list' => array('options' =>
$bocommon->select_list($application->composite_type, $composite_type)),
+ 'composite_type_list' => array('options' =>
$bocommon->select_list($application->composite_type, $composite_types)),
'payment_method_list' => array('options' =>
$bocommon->select_list($application->payment_method, $payment_methods)),
'status_list' => array('options' =>
$this->get_status_options($application->status)),
'mode' => $mode,
Modified: branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
2016-09-07 18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
2016-09-07 18:36:59 UTC (rev 15610)
@@ -45,7 +45,7 @@
$ecodimb_id,
$ecodimb_name,
$district_id,
- $composite_type,
+ $composite_type_id,
$date_start,
$date_end,
$cleaning,
@@ -126,7 +126,7 @@
),
'district_id' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
'type' => 'int'),
- 'composite_type' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'composite_type_id' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int'),
'date_start' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
'type' => 'date'),
Modified: branches/dev-syncromind-2/rental/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/setup/setup.inc.php 2016-09-07
18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/setup/setup.inc.php 2016-09-07
18:36:59 UTC (rev 15610)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module identifier
- $setup_info['rental']['version'] = '0.1.0.27'; // Current module version
+ $setup_info['rental']['version'] = '0.1.0.28'; // Current module version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All contract participants, tenants etc.
Modified: branches/dev-syncromind-2/rental/setup/tables_current.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/setup/tables_current.inc.php
2016-09-07 18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/setup/tables_current.inc.php
2016-09-07 18:36:59 UTC (rev 15610)
@@ -495,7 +495,7 @@
'id' => array('type' => 'auto', 'nullable' =>
false),
'ecodimb_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
'district_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
- 'composite_type' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
+ 'composite_type_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
'cleaning' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
'payment_method' => array('type' => 'int',
'precision' => '2', 'nullable' => false),
'date_start' => array('type' => 'int',
'precision' => '8', 'nullable' => true),
Modified: branches/dev-syncromind-2/rental/setup/tables_update.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/setup/tables_update.inc.php
2016-09-07 18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/setup/tables_update.inc.php
2016-09-07 18:36:59 UTC (rev 15610)
@@ -631,3 +631,22 @@
}
}
+ $test[] = '0.1.0.27';
+ function rental_upgrade0_1_0_27()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $metadata =
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('rental_application');
+ if(isset($metadata['composite_type']))
+ {
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('rental_application',
'composite_type', 'composite_type_id');
+ }
+
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['rental']['currentver'] =
'0.1.0.28';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
+ }
+
Modified: branches/dev-syncromind-2/rental/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind-2/rental/templates/base/application.xsl
2016-09-07 18:34:53 UTC (rev 15609)
+++ branches/dev-syncromind-2/rental/templates/base/application.xsl
2016-09-07 18:36:59 UTC (rev 15610)
@@ -98,7 +98,7 @@
<xsl:value-of
select="$lang_composite_type"/>
</label>
- <select
name="composite_type">
+ <select
name="composite_type_id">
<xsl:attribute
name="title">
<xsl:value-of select="$lang_composite_type"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15610] Syncromind: merge 15608:15609 from trunk,
sigurdne <=