Index: branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php
===================================================================
diff -u -r14582 -r14923
--- branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 14582)
+++ branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 14923)
@@ -1,6 +1,6 @@
'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td' ),
- 'ItemName' => Array( 'title'=>'la_col_ItemName' ),
- 'ItemType' => Array( 'title'=>'la_col_ItemType' ),
+ 'ProductId' => Array('title' => 'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'ItemName' => Array('filter_block' => 'grid_like_filter'),
+ 'ItemType' => Array('title' => 'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
),
),
Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -r14891 -r14923
--- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14891)
+++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14923)
@@ -238,4 +238,6 @@
INSERT INTO ItemFilters VALUES
(DEFAULT, 'p', 'ManufacturerId', 'checkbox', 1, NULL),
(DEFAULT, 'p', 'Price', 'range', 1, 11),
- (DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
\ No newline at end of file
+ (DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
+
+DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME';
\ No newline at end of file
Index: branches/5.2.x/units/discount_items/discount_items_config.php
===================================================================
diff -u -r14582 -r14923
--- branches/5.2.x/units/discount_items/discount_items_config.php (.../discount_items_config.php) (revision 14582)
+++ branches/5.2.x/units/discount_items/discount_items_config.php (.../discount_items_config.php) (revision 14923)
@@ -1,6 +1,6 @@
Array(
'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
- 'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter'),
+ 'ItemName' => Array( 'filter_block' => 'grid_like_filter'),
'ItemType' => Array( 'title'=>'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
),
Index: branches/5.2.x/units/coupon_items/coupon_items_config.php
===================================================================
diff -u -r14582 -r14923
--- branches/5.2.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 14582)
+++ branches/5.2.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 14923)
@@ -1,6 +1,6 @@
Array(
'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'ItemName' => Array( 'filter_block' => 'grid_like_filter', 'width' => 250, ),
'ItemType' => Array( 'title'=>'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
Index: branches/5.2.x/install/english.lang
===================================================================
diff -u -r14884 -r14923
--- branches/5.2.x/install/english.lang (.../english.lang) (revision 14884)
+++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14923)
@@ -94,7 +94,6 @@
RXh0LiBQcmljZQ==
RnJvbSBVc2Vy
R01W
- TmFtZQ==
RGlzY291bnQgSXRlbSBUeXBl
TGFzdCBVcGRhdGVk
TmFtZQ==