[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8130] Merge 8125:8129 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8130] Merge 8125:8129 from trunk |
|
Date: |
Fri, 18 Nov 2011 13:04:12 +0000 |
Revision: 8130
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8130
Author: sigurdne
Date: 2011-11-18 13:04:11 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Merge 8125:8129 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bim/inc/class.sobimitem.inc.php
branches/Version-1_0-branch/bim/setup/setup.inc.php
branches/Version-1_0-branch/bim/setup/tables_current.inc.php
branches/Version-1_0-branch/bim/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/js/yahoo/property.js
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,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124
+
/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,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129
Modified: branches/Version-1_0-branch/bim/inc/class.sobimitem.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/inc/class.sobimitem.inc.php 2011-11-18
12:06:34 UTC (rev 8129)
+++ branches/Version-1_0-branch/bim/inc/class.sobimitem.inc.php 2011-11-18
13:04:11 UTC (rev 8130)
@@ -77,8 +77,13 @@
throw new Exception('ModelId not set');
}
- $sql = "INSERT INTO ".self::bimItemTable." (type, guid,
xml_representation, model) values (";
- $sql = $sql."(select id from ".self::bimTypeTable." where name
= '".$bimItem->getType()."'),";
+ $this->db->query("SELECT id as type FROM ".self::bimTypeTable."
WHERE name = '".$bimItem->getType(),__LINE__,__FILE__);
+ $this->db->next_record();
+ $type = $this->db->f('type');
+ $id = $this->db->next_id('fm_bim_item',array('type' =>
$type));
+
+ $sql = "INSERT INTO ".self::bimItemTable." (type, id, guid,
xml_representation, model) values ($type, $id,";
+ // $sql = $sql."(select id from ".self::bimTypeTable." where name
= '".$bimItem->getType()."'),";
$sql = $sql."'".$bimItem->getGuid()."',
'".$this->db->db_addslashes($bimItem->getXml())."',
".$bimItem->getModelId().")";
try {
if(is_null($this->db->query($sql,__LINE__,__FILE__))) {
Modified: branches/Version-1_0-branch/bim/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/setup.inc.php 2011-11-18 12:06:34 UTC
(rev 8129)
+++ branches/Version-1_0-branch/bim/setup/setup.inc.php 2011-11-18 13:04:11 UTC
(rev 8130)
@@ -12,7 +12,7 @@
*/
$setup_info['bim']['name'] = 'bim';
- $setup_info['bim']['version'] = '0.9.17.502';
+ $setup_info['bim']['version'] = '0.9.17.503';
$setup_info['bim']['app_order'] = 8;
$setup_info['bim']['enable'] = 1;
$setup_info['bim']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/bim/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/tables_current.inc.php
2011-11-18 12:06:34 UTC (rev 8129)
+++ branches/Version-1_0-branch/bim/setup/tables_current.inc.php
2011-11-18 13:04:11 UTC (rev 8130)
@@ -47,19 +47,20 @@
),
'fm_bim_item' => array(
'fd' => array(
- 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
'type' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
+ 'id' => array('type' => 'int', 'precision' =>
4, 'nullable' => False),
'guid' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
'xml_representation' => array('type' =>
'xml','nullable' => False),
'model' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
'p_location_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_id' => array('type' => 'int','precision' =>
'4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'address' => array('type' =>
'varchar','precision' => '150','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
),
- 'pk' => array('id'),
+ 'pk' => array('type','id'),
'fk' => array('fm_bim_type' => array('type' => 'id')),
// 'fk' => array('fm_bim_model' => array('model' => 'id'),
// 'fm_bim_type' =>
array('type' => 'id')),
Modified: branches/Version-1_0-branch/bim/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2011-11-18
12:06:34 UTC (rev 8129)
+++ branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2011-11-18
13:04:11 UTC (rev 8130)
@@ -49,3 +49,23 @@
return $GLOBALS['setup_info']['bim']['currentver'];
}
}
+
+ /**
+ * Update bim version from 0.9.17.502 to 0.9.17.503
+ */
+ $test[] = '0.9.17.502';
+ function bim_upgrade0_9_17_502()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_bim_item','loc1',
array('type' => 'varchar','precision' => '6','nullable' => true));
+ $GLOBALS['phpgw_setup']->oProc->query('ALTER TABLE fm_bim_item
DROP CONSTRAINT fm_bim_item_pkey',__LINE__,__FILE__);
+ $GLOBALS['phpgw_setup']->oProc->query('ALTER TABLE fm_bim_item
ADD CONSTRAINT fm_bim_item_pkey PRIMARY KEY(type,id)',__LINE__,__FILE__);
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['bim']['currentver'] =
'0.9.17.503';
+ return $GLOBALS['setup_info']['bim']['currentver'];
+ }
+ }
+
+
+
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-11-18 12:06:34 UTC (rev 8129)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-11-18 13:04:11 UTC (rev 8130)
@@ -221,7 +221,7 @@
$filter = isset($data['filter']) &&
$data['filter'] ? $data['filter'] : 'all';
$query = isset($data['query']) ?
$data['query'] : '';
$sort = isset($data['sort']) &&
$data['sort'] ? $data['sort'] : 'DESC';
- $order = isset($data['order']) ?
$data['order'] : '';
+ $order = isset($data['order']) &&
$data['order'] ? $data['order'] : 'id';
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id'] : 0;
$district_id = isset($data['district_id']) &&
$data['district_id'] ? $data['district_id'] : 0;
$lookup = isset($data['lookup']) ?
$data['lookup'] : '';
@@ -254,6 +254,11 @@
$GLOBALS['phpgw']->session->appsession("grants_entity_{$entity_id}_{$cat_id}",
$this->type_app[$this->type], $grants);
}
+ $admin_entity =
CreateObject('property.soadmin_entity');
+ $admin_entity->type = $this->type;
+
+ $category =
$admin_entity->read_single_category($entity_id,$cat_id);
+
$location_id =
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
".{$this->type}.{$entity_id}.{$cat_id}");
$entity_table = 'fm_bim_item';
$choice_table = 'phpgw_cust_choice';
@@ -440,27 +445,9 @@
}
$this->uicols = $uicols;
+
//_debug_array($cols_return_extra);
- if ($order)
- {
- switch($order)
- {
- case 'user_id':
- // $ordermethod = " ORDER BY
phpgw_accounts.account_lastname {$sort}"; // Don't work with LDAP.
- break;
- case 'loc1_name':
- $ordermethod = " ORDER BY
fm_location1.loc1_name {$sort}";
- break;
- default:
- $ordermethod = " ORDER BY
$entity_table.$order $sort";
- }
- }
- else
- {
- $ordermethod = " ORDER BY $entity_table.id
DESC";
- }
-_debug_array($ordermethod);
$filtermethod = "WHERE fm_bim_type.location_id =
{$location_id}";
$where= 'AND';
@@ -648,7 +635,13 @@
}
}
- $sql = "SELECT fm_bim_item.* FROM fm_bim_item
{$this->join} fm_bim_type ON (fm_bim_item.type = fm_bim_type.id)";
+ $sql = "SELECT fm_bim_item.* __XML-ORDER__ FROM
fm_bim_item {$this->join} fm_bim_type ON (fm_bim_item.type = fm_bim_type.id)";
+ if(isset($category['location_level']) &&
$category['location_level'])
+ {
+ $sql .= "{$this->join} fm_location1 ON
(fm_bim_item.loc1 = fm_location1.loc1)";
+ $sql .= "{$this->join} fm_part_of_town ON
(fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id)";
+ $sql .= "{$this->join} fm_owner ON
(fm_location1.owner_id = fm_owner.id)";
+ }
$_joinmethod_datatype =
array_merge($_joinmethod_datatype, $_joinmethod_datatype_custom);
foreach($_joinmethod_datatype as $_joinmethod)
@@ -656,6 +649,7 @@
$sql .= $_joinmethod;
}
+_debug_array($sql);
$querymethod = '';
$_querymethod = array_merge($__querymethod,
$_querymethod);
@@ -669,17 +663,18 @@
$sql .= " $filtermethod $querymethod";
+ $_sql = str_replace('__XML-ORDER__', '', $sql);
// $cache_info =
phpgwapi_cache::session_get('property',"{$location_id}_listing_metadata");
- if (!isset($cache_info['sql_hash']) ||
$cache_info['sql_hash'] != md5($sql))
+ if (!isset($cache_info['sql_hash']) ||
$cache_info['sql_hash'] != md5($_sql))
{
$cache_info = array();
}
// if(!$cache_info)
{
- $sql_cnt = "SELECT DISTINCT fm_bim_item.id " .
substr($sql,strripos($sql,'FROM'));
+ $sql_cnt = "SELECT DISTINCT fm_bim_item.id " .
substr($_sql,strripos($_sql,'FROM'));
$sql2 = "SELECT count(*) as cnt FROM
({$sql_cnt}) as t";
$this->db->query($sql2,__LINE__,__FILE__);
@@ -690,7 +685,7 @@
$cache_info = array
(
'total_records' =>
$this->db->f('cnt'),
- 'sql_hash' =>
md5($sql)
+ 'sql_hash' =>
md5($_sql)
);
phpgwapi_cache::session_set('property',"{$location_id}_listing_metadata",$cache_info);
}
@@ -702,14 +697,43 @@
return array();
}
-//$sql . $ordermethod
+ $ordermethod = '';
+ $xml_order = '';
+ if ($order)
+ {
+ switch($order)
+ {
+ case 'user_id':
+ // $ordermethod = " ORDER BY
phpgw_accounts.account_lastname {$sort}"; // Don't work with LDAP.
+ break;
+ case 'loc1_name':
+ $ordermethod = " ORDER BY
fm_location1.loc1_name {$sort}";
+ break;
+ case 'id':
+ $ordermethod = " ORDER BY
{$entity_table}.id {$sort}";
+ break;
+ default:
+ $xml_order = ',cast
(_order_field[1] as text) as _order_field_text';
+ $sql = str_replace('FROM
fm_bim_item', "FROM (SELECT fm_bim_item.*, xpath('$order/text()',
xml_representation) as _order_field FROM fm_bim_item", $sql);
+ $sql .= ") as fm_bim_item ORDER
BY _order_field_text {$sort}";
+ }
+ }
+ else
+ {
+ $ordermethod = " ORDER BY {$entity_table}.id
DESC";
+ }
+
+ $sql = str_replace('__XML-ORDER__', $xml_order, $sql);
+
+ //SELECT id, cast (order_field[1] as text) as
order_field_text FROM (SELECT id, xpath('address/text()', xml_representation)
as order_field FROM fm_bim_item) as t ORDER BY order_field_text asc
+
if(!$allrows)
{
- $this->db->limit_query($sql,
$start,__LINE__,__FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start,__LINE__,__FILE__);
}
else
{
- $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
}
$j=0;
@@ -1002,6 +1026,7 @@
}
$this->uicols = $uicols;
+
//_debug_array($cols_return_extra);
if ($order)
@@ -1582,6 +1607,7 @@
$this->db->query("SELECT id as type FROM fm_bim_type
WHERE location_id = {$location_id}",__LINE__,__FILE__);
$this->db->next_record();
$type = $this->db->f('type');
+ $id = $this->db->next_id('fm_bim_item',array('type'
=> $type));
phpgw::import_class('phpgwapi.xmlhelper');
$xmldata = phpgwapi_xmlhelper::toXML($data, 'PHPGW');
@@ -1604,14 +1630,16 @@
$values_insert = array
(
+ 'id' => $id,
'type' =>
$type,
'guid' =>
$guid,
'xml_representation' =>
$this->db->db_addslashes($xml),
'model' => 0,
'p_location_id' =>
isset($data['p_location_id']) && $data['p_location_id'] ?
$data['p_location_id'] : '',
'p_id' =>
isset($data['p_id']) && $data['p_id'] ? $data['p_id'] : '',
- 'location_code' =>
$data['location_code'],//character varying(20),
- 'address' =>
$data['address'],//character varying(150),
+ 'location_code' =>
$data['location_code'],
+ 'loc1' =>
$data['loc1'],
+ 'address' =>
$data['address'],
'entry_date' => time(),
'user_id' =>
$this->account
);
@@ -1619,10 +1647,9 @@
$this->db->query("INSERT INTO fm_bim_item (" .
implode(',',array_keys($values_insert)) . ') VALUES ('
.
$this->db->validate_insert(array_values($values_insert)) .
')',__LINE__,__FILE__);
- return
$this->db->get_last_insert_id('fm_bim_item','id');
+ return $id;
}
-
protected function _edit_eav($data = array(),$location_id, $id)
{
$location_id = (int) $location_id;
@@ -1643,8 +1670,9 @@
'xml_representation' =>
$this->db->db_addslashes($xml),
'p_location_id' =>
isset($data['p_location_id']) && $data['p_location_id'] ?
$data['p_location_id'] : '',
'p_id' =>
isset($data['p_id']) && $data['p_id'] ? $data['p_id'] : '',
- 'location_code' =>
$data['location_code'],//character varying(20),
- 'address' =>
$data['address'],//character varying(150),
+ 'location_code' =>
$data['location_code'],
+ 'loc1' =>
$data['loc1'],
+ 'address' =>
$data['address'],
);
$value_set =
$this->db->validate_update($value_set);
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2011-11-18
12:06:34 UTC (rev 8129)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2011-11-18
13:04:11 UTC (rev 8130)
@@ -916,8 +916,8 @@
// height
: tableHeight //"30em",
};
//Create DataTable ; Second call JSON (GET)
- // myDataTable = new YAHOO.widget.DataTable(container[0],
myColumnDefs, myDataSource, myTableConfig);
- myDataTable = new YAHOO.widget.ScrollingDataTable(container[0],
myColumnDefs, myDataSource, myTableConfig);
+ myDataTable = new YAHOO.widget.DataTable(container[0],
myColumnDefs, myDataSource, myTableConfig);
+ // myDataTable = new YAHOO.widget.ScrollingDataTable(container[0],
myColumnDefs, myDataSource, myTableConfig);
myDataTable.on('cellMouseoverEvent', function (oArgs)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8130] Merge 8125:8129 from trunk,
Sigurd Nes <=