Index: branches/5.2.x/units/products/products_config.php
===================================================================
diff -u -N -r14258 -r14569
--- branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14258)
+++ branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14569)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: products_config.php 14569 2011-09-20 10:30:56Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -424,7 +424,7 @@
 																		), // key - special, value - list select sql
 					'ListSortings'	=> 	Array (
 																'' => Array (
-																	'ForcedSorting' => Array ('Priority' => 'desc'),
+																	'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'),
 																	'Sorting' => Array ('Name' => 'asc'),
 																)
 															),
@@ -490,10 +490,31 @@
 					    'Hits'					=>	Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
 					    'CreatedOn'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					    'Expire'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
-					    'Type'					=>	Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1=> 'la_product_tangible',  2=> 'la_product_subscription', 4=> 'la_product_downloadable', 3=> 'la_product_service'/*, 6=> 'la_gift_certificate', 5=> 'la_product_package'*/), 'not_null' => 1, 'default' => 1 ),
+					    'Type'					=>	Array (
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,							
+							'options' => Array (
+								PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
+								PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
+								PRODUCT_TYPE_SERVICE => 'la_product_service',
+								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable', 
+								/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
+							),
+							'not_null' => 1, 'default' => 1,
+						),
 					    'Modified'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					    'ModifiedById'			=>	Array ('type' => 'int', 'default' => NULL),
-					    'CreatedById'			=>	Array ('type' => 'int', 'required' => 1, 'default' => NULL),
+					    'CreatedById' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kLEFTFormatter', 
+			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser 
+			            					WHERE `%s` = \'%s\'',
+			            	'left_key_field' => 'PortalUserId',
+			            	'left_title_field' => 'Login',
+							'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
+			            	'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
+						),
 					    'ResourceId'			=>	Array ('type' => 'int', 'default' => null),
 					    'CachedReviewsQty'		=>	Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
 					    'InventoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
@@ -622,6 +643,7 @@
 								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
 								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
@@ -649,6 +671,7 @@
 								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
 								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),