Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1168760
D75.id287.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
Thu, Sep 25, 10:12 AM
Size
2 KB
Mime Type
text/x-diff
Expires
Fri, Sep 26, 10:12 AM (10 h, 16 m)
Engine
blob
Format
Raw Data
Handle
757161
Attached To
D75: INP-1548 - Apply grid filters, when exporting data
D75.id287.diff
View Options
Index: branches/5.2.x/admin_templates/orders/orders_search_list.tpl
===================================================================
--- branches/5.2.x/admin_templates/orders/orders_search_list.tpl
+++ branches/5.2.x/admin_templates/orders/orders_search_list.tpl
@@ -29,6 +29,7 @@
a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
set_hidden_field('export_finish_t', 'in-commerce/orders/export/export_finish');
set_hidden_field('export_progress_t', 'in-commerce/orders/export/export_progress');
+ set_hidden_field('grid', 'Search');
open_popup('ord.search', 'OnExport', 'in-commerce/orders/export/export');
}
) );
@@ -68,4 +69,4 @@
<inp2:m_include t="incs/footer"/>
<script type="text/javascript">
set_hidden_field('order_type','search');
-</script>
\ No newline at end of file
+</script>
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
--- branches/5.2.x/units/orders/orders_event_handler.php
+++ branches/5.2.x/units/orders/orders_event_handler.php
@@ -3752,24 +3752,8 @@
{
parent::OnBeforeExportBegin($event);
- $options = $event->getEventParam('options');
-
- $items_list = $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List');
- /* @var $items_list kDBList */
-
- $items_list->SetPerPage(-1);
-
- if ( $options['export_ids'] != '' ) {
- $items_list->AddFilter('export_ids', $items_list->TableName . '.' . $items_list->IDField . ' IN (' . implode(',', $options['export_ids']) . ')');
- }
-
- $options['ForceCountSQL'] = $items_list->getCountSQL($items_list->GetSelectSQL(true, false));
- $options['ForceSelectSQL'] = $items_list->GetSelectSQL();
-
- $event->setEventParam('options', $options);
-
+ /** @var kDBItem $object */
$object = $this->Application->recallObject($event->Prefix . '.export');
- /* @var $object kDBItem */
$object->SetField('Number', 999999);
$object->SetField('SubNumber', 999);
Event Timeline
Log In to Comment