Attached Files |
temp_id_core.patch [^] (4,648 bytes) 2010-05-19 07:02
[Show Content]
Index: kernel/db/db_event_handler.php
===================================================================
--- kernel/db/db_event_handler.php (revision 13571)
+++ kernel/db/db_event_handler.php (working copy)
@@ -1150,15 +1150,12 @@
$this->customProcessing($event,'before');
//look at kDBItem' Create for ForceCreateId description, it's rarely used and is NOT set by default
- if( $object->Create($event->getEventParam('ForceCreateId')) )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create($event->getEventParam('ForceCreateId')) ) {
$this->customProcessing($event,'after');
$event->status=erSUCCESS;
$event->redirect_params = Array('opener'=>'u');
}
- else
- {
+ else {
$event->status = erFAIL;
$event->redirect = false;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
@@ -2165,9 +2162,6 @@
if ($is_new) {
$object->Create();
- if (!$is_main && $object->IsTempTable()) {
- $object->setTempID();
- }
}
else {
$object->Update();
Index: kernel/db/dbitem.php
===================================================================
--- kernel/db/dbitem.php (revision 13573)
+++ kernel/db/dbitem.php (working copy)
@@ -916,6 +916,12 @@
if ($this->mode != 't') {
$this->Application->resetCounters($this->TableName);
}
+
+ if ($this->IsTempTable() && ($this->Application->GetTopmostPrefix($this->Prefix) != $this->Prefix)) {
+ // temp table + subitem = set negative id
+ $this->setTempID();
+ }
+
$this->raiseEvent('OnAfterItemCreate');
$this->Loaded = true;
@@ -1287,15 +1293,7 @@
$cdata->SetDBField($ml_formatter->LangFieldName('cust_'.$custom_id, $force_primary), $this->GetDBField('cust_'.$custom_name));
}
- if ($cdata->isLoaded()) {
- $ret = $cdata->Update();
- }
- else {
- $ret = $cdata->Create();
- if ($cdata->mode == 't') $cdata->setTempID();
- }
-
- return $ret;
+ return $cdata->isLoaded() ? $cdata->Update() : $cdata->Create();
}
/**
Index: kernel/utility/temp_handler.php
===================================================================
--- kernel/utility/temp_handler.php (revision 13571)
+++ kernel/utility/temp_handler.php (working copy)
@@ -305,9 +305,7 @@
// remember original => clone mapping for dual ForeignKey updating
$this->AlreadyProcessed[$master['TableName']][$id] = $object->GetId();
}
- if ($object->mode == 't') {
- $object->setTempID();
- }
+
if ($mode == 'create') {
$this->RaiseEvent('OnAfterClone', $master['Prefix'], $special, Array($object->GetId()), $foreign_key, array('original_id' => $id) );
$this->saveID($master['Prefix'], $special, $object->GetID());
Index: units/helpers/brackets_helper.php
===================================================================
--- units/helpers/brackets_helper.php (revision 13571)
+++ units/helpers/brackets_helper.php (working copy)
@@ -291,9 +291,7 @@
$object->SetFieldsFromHash($values);
$object->SetDBField($linked_info['ForeignKey'], $linked_info['ParentId']);
- if( $object->Create() )
- {
- $object->setTempID();
+ if ($object->Create()) {
$event->status = erSUCCESS;
}
}
Index: units/helpers/controls/edit_picker_helper.php
===================================================================
--- units/helpers/controls/edit_picker_helper.php (revision 13571)
+++ units/helpers/controls/edit_picker_helper.php (working copy)
@@ -154,10 +154,6 @@
$object->SetDBField($foreign_key, $main_id);
$object->SetDBField($sub_prefix_field, $add_id);
$object->Create();
-
- if ($object->IsTempTable()) {
- $object->setTempID();
- }
}
}
}
Index: units/selectors/selectors_event_handler.php
===================================================================
--- units/selectors/selectors_event_handler.php (revision 13571)
+++ units/selectors/selectors_event_handler.php (working copy)
@@ -178,18 +178,16 @@
if($items_info)
{
list($id,$field_values) = each($items_info);
- if($id == 0)
- {
+ if ($id == 0) {
$parent_id = getArrayValue($field_values,'ParentId');
if($parent_id) $object->Load($parent_id);
$object->SetFieldsFromHash($field_values);
$object->Create();
- if( $object->IsTempTable() ) $object->setTempID();
+
$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID() );
}
- else
- {
+ else {
$object->Load($id);
$object->SetFieldsFromHash($field_values);
$object->Update();
temp_id_modules.patch [^] (10,948 bytes) 2010-05-19 07:02
[Show Content]
Index: in-auction/units/category_listing/category_listing_eh.php
===================================================================
--- in-auction/units/category_listing/category_listing_eh.php (revision 13571)
+++ in-auction/units/category_listing/category_listing_eh.php (working copy)
@@ -117,22 +117,11 @@
$object->SetDBField('ItemSpecifics', null);
}
+ $ret = $object->isLoaded() ? $object->Update() : $object->Create();
- if ($object->isLoaded()) {
- if (!$object->Update())
- {
- $event->MasterEvent->status = erFAIL;
- }
+ if (!$ret) {
+ $event->MasterEvent->status = erFAIL;
}
- else {
- if (!$object->Create())
- {
- $event->MasterEvent->status = erFAIL;
- } else {
- $object->setTempID();
- }
- }
-
}
function OnBeforeItemUpdate(&$event)
Index: in-auction/units/product_listing/product_listing_eh.php
===================================================================
--- in-auction/units/product_listing/product_listing_eh.php (revision 13571)
+++ in-auction/units/product_listing/product_listing_eh.php (working copy)
@@ -143,21 +143,11 @@
$object->SetDBField('ItemSpecifics', null);
}
+ $ret = $object->isLoaded() ? $object->Update() : $object->Create();
- if ($object->isLoaded()) {
- if (!$object->Update())
- {
- $event->MasterEvent->status = erFAIL;
- }
+ if (!$ret) {
+ $event->MasterEvent->status = erFAIL;
}
- else {
- if (!$object->Create())
- {
- $event->MasterEvent->status = erFAIL;
- } else {
- $object->setTempID();
- }
- }
}
Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php (revision 13571)
+++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php (working copy)
@@ -45,16 +45,13 @@
$object->SetDBField('ItemResourceId', -1);
$object->SetDBField('ItemType', 0);
- if( $object->Create() )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create() ) {
$this->customProcessing($event, 'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
$event->redirect_params = Array('opener' => 's'); //stay!
}
- else
- {
- $event->status=erFAIL;
+ else {
+ $event->status = erFAIL;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
Index: in-commerce/units/coupon_items/coupon_items_event_handler.php
===================================================================
--- in-commerce/units/coupon_items/coupon_items_event_handler.php (revision 13571)
+++ in-commerce/units/coupon_items/coupon_items_event_handler.php (working copy)
@@ -57,16 +57,13 @@
$object->SetDBField('ItemResourceId', -1);
$object->SetDBField('ItemType', 0);
- if( $object->Create() )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create() ) {
$this->customProcessing($event, 'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
$event->redirect_params = Array('opener' => 's'); //stay!
}
- else
- {
- $event->status=erFAIL;
+ else {
+ $event->status = erFAIL;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
Index: in-commerce/units/destinations/dst_event_handler.php
===================================================================
--- in-commerce/units/destinations/dst_event_handler.php (revision 13571)
+++ in-commerce/units/destinations/dst_event_handler.php (working copy)
@@ -32,16 +32,13 @@
$object->SetFieldsFromHash($field_values);
$this->customProcessing($event, 'before');
- if( $object->Create() )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create() ) {
$this->customProcessing($event, 'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
}
- else
- {
- $event->status=erFAIL;
- $event->redirect=false;
+ else {
+ $event->status = erFAIL;
+ $event->redirect = false;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
@@ -106,7 +103,6 @@
$object->SetDBField('StdDestId', $dest_id);
$object->SetDBField('DestValue', $dest_value);
$object->Create();
- $object->setTempID();
}
}
Index: in-commerce/units/discount_items/discount_items_event_handler.php
===================================================================
--- in-commerce/units/discount_items/discount_items_event_handler.php (revision 13571)
+++ in-commerce/units/discount_items/discount_items_event_handler.php (working copy)
@@ -85,7 +85,6 @@
$object->SetDBField('ItemResourceId', $resource_id);
$object->SetDBField('ItemType', 1);
$object->Create();
- $object->setTempID();
}
}
$this->finalizePopup($event);
@@ -108,16 +107,13 @@
$object->SetDBField('ItemResourceId', -1);
$object->SetDBField('ItemType', 0);
- if( $object->Create() )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create() ) {
$this->customProcessing($event,'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
$event->redirect_params = Array('opener' => 's'); //stay!
}
- else
- {
- $event->status=erFAIL;
+ else {
+ $event->status = erFAIL;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
Index: in-commerce/units/orders/orders_event_handler.php
===================================================================
--- in-commerce/units/orders/orders_event_handler.php (revision 13571)
+++ in-commerce/units/orders/orders_event_handler.php (working copy)
@@ -2604,7 +2604,6 @@
$item_data = $passed_item_data;
$object->SetDBField('ItemData', serialize($item_data));
$object->Create();
- if( $this->UseTempTables($event) ) $object->SetTempId();
}
else {
return false; // item requiring to set qty to 0, meaning already does not exist
@@ -2754,9 +2753,6 @@
}
else {
$object->Create();
- if ($this->UseTempTables($event)) {
- $object->setTempID();
- }
}
$this->Application->HandleEvent($ord_event, 'ord:OnRecalculateItems');
Index: in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php
===================================================================
--- in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php (revision 13571)
+++ in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php (working copy)
@@ -45,10 +45,6 @@
$this->customProcessing($event, 'before');
if ( $object->Create() ) {
- if ( $object->IsTempTable() ) {
- $object->setTempID();
- }
-
$this->customProcessing($event, 'after');
$event->status = erSUCCESS;
}
Index: in-commerce/units/pricing/pricing_event_handler.php
===================================================================
--- in-commerce/units/pricing/pricing_event_handler.php (revision 13571)
+++ in-commerce/units/pricing/pricing_event_handler.php (working copy)
@@ -207,7 +207,6 @@
if( $object->Create() )
{
- $object->setTempID();
$event->status=erSUCCESS;
}
}
Index: in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php (revision 13571)
+++ in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php (working copy)
@@ -101,7 +101,6 @@
else {
if( $object->Create($event->getEventParam('ForceCreateId')) )
{
- if( $object->IsTempTable() ) $object->setTempID();
$this->customProcessing($event,'after');
$event->status=erSUCCESS;
}
Index: in-commerce/units/products/products_event_handler.php
===================================================================
--- in-commerce/units/products/products_event_handler.php (revision 13571)
+++ in-commerce/units/products/products_event_handler.php (working copy)
@@ -944,11 +944,8 @@
$field_values = Array('ProductId' => $product_id, 'IsPrimary' => 1, 'MinQty' => 1, 'MaxQty' => -1, 'GroupId'=>$group_id);
$pr_object->SetDBFieldsFromHash($field_values);
$pr_object->SetField('Price', $price);
- $ret = $pr_object->Create();
- if ($pr_object->mode == 't') {
- $pr_object->setTempID();
- }
- return $ret;
+
+ return $pr_object->Create();
}
}
Index: in-commerce/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
--- in-commerce/units/shipping_costs/shipping_costs_event_handler.php (revision 13571)
+++ in-commerce/units/shipping_costs/shipping_costs_event_handler.php (working copy)
@@ -53,16 +53,13 @@
$object->SetFieldsFromHash($field_values);
$this->customProcessing($event,'before');
- if( $object->Create() )
- {
- if ( $object->IsTempTable() ) $object->setTempID();
+ if( $object->Create() ) {
$this->customProcessing($event,'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
}
- else
- {
- $event->status=erFAIL;
- $event->redirect=false;
+ else {
+ $event->status = erFAIL;
+ $event->redirect = false;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
Index: in-commerce/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
--- in-commerce/units/taxesdestinations/taxes_dst_event_handler.php (revision 13571)
+++ in-commerce/units/taxesdestinations/taxes_dst_event_handler.php (working copy)
@@ -82,16 +82,13 @@
$object->SetFieldsFromHash($field_values);
$this->customProcessing($event,'before');
- if( $object->Create() )
- {
- if( $object->IsTempTable() ) $object->setTempID();
+ if ( $object->Create() ) {
$this->customProcessing($event,'after');
- $event->status=erSUCCESS;
+ $event->status = erSUCCESS;
}
- else
- {
- $event->status=erFAIL;
- $event->redirect=false;
+ else {
+ $event->status = erFAIL;
+ $event->redirect = false;
$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
$object->setID(0);
}
@@ -155,7 +152,6 @@
$object->SetDBField('StdDestId', $dest_id);
$object->SetDBField('DestValue', $dest_value);
$object->Create();
- $object->setTempID();
}
}
|