Index: trunk/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r1566 -r7391
--- trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 1566)
+++ trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 7391)
@@ -7,43 +7,82 @@
 					'EventHandlerClass'	=>	Array('class'=>'EmailMessagesEventHandler','file'=>'email_messages_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-											
+
 					'QueryString'		=>	Array(
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4	=>	'mode',
 											),
-											
+
 					'IDField'			=>	'EmailMessageId',
 
 					'TitleField'		=>	'Subject',
-									
+
 					'TableName'			=>	TABLE_PREFIX.'EmailMessage',
-											
-					'ListSQLs'			=>	Array(	''=>'SELECT * FROM %s'),
-																		 
-					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s'),
-					
+
+					'ListSQLs'			=>	Array(
+						''=>'
+							SELECT %1$s.* %2$s
+							FROM %1$s
+						 	LEFT JOIN '.TABLE_PREFIX.'Events
+						 	ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId
+						'
+					),
+
+					'ItemSQLs'			=>	Array(
+						''=>'
+							SELECT %1$s.* %2$s
+							FROM %1$s
+						 	LEFT JOIN '.TABLE_PREFIX.'Events
+						 	ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId
+						'
+					),
+
 					'ForeignKey'		=>	'LanguageId',
 					'ParentTableKey' 	=> 	'LanguageId',
 					'ParentPrefix' 		=> 	'lang',
 					'AutoDelete'		=>	true,
 					'AutoClone'			=> 	true,
-									
+
+					'CalculatedFields' => array(
+						'' => array(
+							'Description' => TABLE_PREFIX.'Events.Description',
+							'Module' => TABLE_PREFIX.'Events.Module',
+							'Type' => TABLE_PREFIX.'Events.Type',
+						),
+					),
+
 					'Fields'			=>	Array(
-													'EmailMessageId' => Array(),
-													'Template' => Array('type' => 'string','default' => ''),
-													'MessageType' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
-													'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-													'EventId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-									        ),
-									        
+						'EmailMessageId' => Array(),
+						'Template' => Array('type' => 'string','default' => ''),
+						'MessageType' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
+						'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
+						'EventId' => Array('type' => 'int','not_null' => '1','default' => '0'),
+						'Subject'	=>	Array('type'=>'string'),
+	        ),
+
 					'VirtualFields'		=>	Array(
-													'Headers'	=>	Array('type'=>'string'),
-													'Subject'	=>	Array('type'=>'string'),
-													'Body'		=>	Array('type'=>'string'),
-											),
-					
+						'Headers'	=>	Array('type'=>'string'),
+						'Body'		=>	Array('type'=>'string'),
+						'Description'		=>	Array('type'=>'string', 'sql_filter_type'=>'having'),
+						'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
+            'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
+					),
+
+					'Grids'	=> Array(
+						'Default'		=>	Array(
+							'Icons' => Array('default'=>'icon16_custom.gif'),
+							'Fields' => Array(
+									'Description'	=>	Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
+									'Subject'			=>	Array( 'title'=>'la_col_Subject'),
+									'Type'			=>	Array( 'title'=>'la_col_Type'),
+								),
+
+						),
+					),
+
+
 	);
 
 ?>
\ No newline at end of file