Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1046739
D160.id376.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Jun 29, 3:55 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Mon, Jun 30, 3:55 AM (4 h, 31 m)
Engine
blob
Format
Raw Data
Handle
676730
Attached To
D160: INP-1486 Don't give up, when single item update fails in "iterateItems" method
D160.id376.diff
View Options
Index: core/kernel/db/cat_event_handler.php
===================================================================
--- core/kernel/db/cat_event_handler.php
+++ core/kernel/db/cat_event_handler.php
@@ -2640,24 +2640,17 @@
if ( $ids ) {
foreach ($ids as $id) {
- $ret = true;
$object->Load($id);
switch ( $event->Name ) {
case 'OnMassApprove':
- $ret = $object->ApproveChanges();
+ $object->ApproveChanges();
break;
case 'OnMassDecline':
- $ret = $object->DeclineChanges();
+ $object->DeclineChanges();
break;
}
-
- if ( !$ret ) {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
}
}
Index: core/kernel/db/db_event_handler.php
===================================================================
--- core/kernel/db/db_event_handler.php
+++ core/kernel/db/db_event_handler.php
@@ -2264,14 +2264,7 @@
break;
}
- if ( $object->Update() ) {
- $event->status = kEvent::erSUCCESS;
- }
- else {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
+ $object->Update();
}
}
Index: core/units/categories/categories_event_handler.php
===================================================================
--- core/units/categories/categories_event_handler.php
+++ core/units/categories/categories_event_handler.php
@@ -1589,16 +1589,9 @@
$this->Conn->Query($sql);
}
- $event->status = kEvent::erSUCCESS;
-
$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
}
- else {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
}
}
Index: modules/in-commerce/units/affiliates/affiliates_event_handler.php
===================================================================
--- modules/in-commerce/units/affiliates/affiliates_event_handler.php
+++ modules/in-commerce/units/affiliates/affiliates_event_handler.php
@@ -626,14 +626,9 @@
$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED');
break;
}
- $event->status = kEvent::erSUCCESS;
+
$event->SetRedirectParam('opener', 's'); //stay!
}
- else {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
}
}
}
Index: modules/in-link/units/link_validation/link_validation_eh.php
===================================================================
--- modules/in-link/units/link_validation/link_validation_eh.php
+++ modules/in-link/units/link_validation/link_validation_eh.php
@@ -439,24 +439,17 @@
/* @var $object kCatDBItem */
foreach ($ids as $id) {
- $ret = true;
$object->Load($id);
switch ( $event->Name ) {
case 'OnApproveLinks':
- $ret = $object->ApproveChanges();
+ $object->ApproveChanges();
break;
case 'OnDeclineLinks':
- $ret = $object->DeclineChanges();
+ $object->DeclineChanges();
break;
}
-
- if ( !$ret ) {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
}
}
@@ -568,4 +561,4 @@
$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
}
- }
\ No newline at end of file
+ }
Index: modules/in-link/units/listings/listings_event_handler.php
===================================================================
--- modules/in-link/units/listings/listings_event_handler.php
+++ modules/in-link/units/listings/listings_event_handler.php
@@ -614,11 +614,6 @@
$this->Application->emailUser('LINK.ENHANCE.RENEW', $owner_id);
$this->Application->emailAdmin('LINK.ENHANCE.RENEW');
}
- else {
- $event->status = kEvent::erFAIL;
- $event->redirect = false;
- break;
- }
}
else {
$this->Application->emailUser('LINK.ENHANCE.APPROVE', $owner_id);
@@ -843,4 +838,4 @@
$calculated_fields['']['LinkName'] = 'CONCAT(item_table.l' . $language_id . '_Name, " (", item_table.Url, ")")';
$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
}
-}
\ No newline at end of file
+}
Event Timeline
Log In to Comment