[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14972] property: more on integration
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14972] property: more on integration |
|
Date: |
Wed, 04 May 2016 14:10:51 +0000 |
Revision: 14972
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14972
Author: sigurdne
Date: 2016-05-04 14:10:51 +0000 (Wed, 04 May 2016)
Log Message:
-----------
property: more on integration
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/project.xsl
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/inc/class.bocommon.inc.php 2016-05-04 14:10:51 UTC (rev
14972)
@@ -2431,14 +2431,16 @@
$query = phpgw::get_var('query');
$sogeneric = CreateObject('property.sogeneric',
'eco_service');
- $values = $sogeneric->read(array('query' => $query));
+ $filter = array('active' => 1);
+ $values = $sogeneric->read(array('filter' =>
$filter,'query' => $query));
+
return array('ResultSet' => array('Result' => $values));
}
public function get_eco_service_name( $id )
{
- $ret = '';
+ $ret = $id;
if($id = (int)$id)
{
$sogeneric = CreateObject('property.sogeneric',
'eco_service');
@@ -2496,7 +2498,8 @@
$query = phpgw::get_var('query');
$sogeneric = CreateObject('property.sogeneric',
'external_project');
- $values = $sogeneric->read(array('query' => $query));
+ $filter = array('active' => 1);
+ $values = $sogeneric->read(array('filter' =>
$filter,'query' => $query));
foreach ($values as &$value)
{
@@ -2508,7 +2511,7 @@
public function get_external_project_name( $id )
{
- $ret = '';
+ $ret = $id;
if($id)
{
$sogeneric = CreateObject('property.sogeneric',
'external_project');
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/inc/class.sogeneric.inc.php 2016-05-04 14:10:51 UTC (rev
14972)
@@ -1074,8 +1074,7 @@
'descr' =>
lang('descr'),
'type' =>
'varchar'
),
- array
- (
+ array(
'name' =>
'active',
'descr' =>
lang('active'),
'type' =>
'checkbox',
@@ -1234,8 +1233,7 @@
'table' =>
'fm_external_project',
'id' => array('name' => 'id',
'type' => 'varchar'),
'fields' => array(
- array
- (
+ array(
'name' =>
'name',
'descr' =>
lang('name'),
'type' =>
'varchar'
@@ -1244,6 +1242,18 @@
'name' =>
'budget',
'descr' =>
lang('budget'),
'type' => 'int'
+ ),
+ array(
+ 'name' =>
'active',
+ 'descr' =>
lang('active'),
+ 'type' =>
'checkbox',
+ 'default' =>
'checked',
+ 'filter' =>
true,
+ 'sortable' =>
true,
+ 'values_def' =>
array
+ (
+
'valueset' => array(array('id' => 1, 'name' => lang('active'))),
+ )
)
),
'edit_msg' => lang('edit'),
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2016-05-04 14:10:38 UTC (rev 14971)
+++ trunk/property/setup/setup.inc.php 2016-05-04 14:10:51 UTC (rev 14972)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.700';
+ $setup_info['property']['version'] = '0.9.17.701';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/setup/tables_current.inc.php 2016-05-04 14:10:51 UTC (rev
14972)
@@ -1228,7 +1228,7 @@
'fd' => array(
'id' => array('type' => 'int', 'precision' =>
'4', 'nullable' => False),
'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => False),
- 'active' => array('type' => 'int', 'precision'
=> '2', 'nullable' => True, 'default' => '0'),
+ 'active' => array('type' => 'int', 'precision'
=> '2', 'nullable' => True, 'default' => 1),
),
'pk' => array('id'),
'ix' => array(),
@@ -1795,6 +1795,7 @@
'id' => array('type' => 'varchar', 'precision'
=> '10', 'nullable' => False),
'name' => array('type' => 'varchar',
'precision' => '255', 'nullable' => False),
'budget' => array('type' => 'int', 'precision'
=> '4', 'nullable' => True),
+ 'active' => array('type' => 'int', 'precision'
=> 2, 'nullable' => True, 'default' => 1),
),
'pk' => array('id'),
'fk' => array(),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/setup/tables_update.inc.php 2016-05-04 14:10:51 UTC (rev
14972)
@@ -8870,7 +8870,7 @@
'fd' => array(
'id' => array('type' => 'int',
'precision' => '4', 'nullable' => False),
'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => False),
- 'active' => array('type' => 'int',
'precision' => '2', 'nullable' => True, 'default' => '0'),
+ 'active' => array('type' => 'int',
'precision' => '2', 'nullable' => True, 'default' => 1),
),
'pk' => array('id'),
'ix' => array(),
@@ -9125,3 +9125,28 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.696 to 0.9.17.697
+ *
+ */
+ $test[] = '0.9.17.700';
+
+ function property_upgrade0_9_17_700()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn("fm_external_project", 'active',
array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => True,
+ 'default' => 1
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.701';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/templates/base/project.xsl 2016-05-04 14:10:51 UTC (rev
14972)
@@ -336,7 +336,7 @@
<xsl:value-of
select="php:function('lang', 'external project')"/>
</label>
<input type="hidden"
id="external_project_id" name="values[external_project_id]"
value="{value_external_project_id}"/>
- <input type="text"
id="external_project_name" name="values[external_project_name]"
value="{value_external_project_id} {value_external_project_name}"/>
+ <input type="text"
id="external_project_name" name="values[external_project_name]"
value="{value_external_project_name}"/>
<div id="external_project_container"/>
</div>
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2016-05-04 14:10:38 UTC (rev
14971)
+++ trunk/property/templates/base/tts.xsl 2016-05-04 14:10:51 UTC (rev
14972)
@@ -653,7 +653,7 @@
<xsl:value-of select="php:function('lang', 'external project')"/>
</label>
<input type="hidden" id="external_project_id"
name="values[external_project_id]" value="{value_external_project_id}"/>
-
<input type="text" id="external_project_name"
name="values[external_project_name]" value="{value_external_project_id}
{value_external_project_name}"/>
+
<input type="text" id="external_project_name"
name="values[external_project_name]" value="{value_external_project_name}"/>
<div id="external_project_container"/>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14972] property: more on integration,
Sigurd Nes <=