Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r9047 -r10194
--- branches/RC/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 9047)
+++ branches/RC/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 10194)
@@ -50,7 +50,7 @@
'Fields' => Array (
'EmailMessageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
'Template' => Array('type' => 'string', 'default' => null),
- 'MessageType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
+ 'MessageType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'use_phrases' => 1, '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', 'default' => null),
Index: branches/RC/core/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -r9369 -r10194
--- branches/RC/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 9369)
+++ branches/RC/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 10194)
@@ -57,14 +57,29 @@
*/
function OnBeforeItemLoad(&$event)
{
- if( !$event->getEventParam('id') )
- {
+ if (!$event->getEventParam('id')) {
$this->OnNew($event);
+
$event->status = erFATAL;
}
}
/**
+ * Sets event id
+ *
+ * @param kEvent $event
+ */
+ function OnNew(&$event)
+ {
+ parent::OnNew($event);
+
+ $object =& $event->getObject();
+ /* @var $object kDBItem */
+
+ $object->SetDBField('EventId', $this->getEmailEventId());
+ }
+
+ /**
* Parse message template (split into header, subject & body)
*
* @param kEvent $event
Index: branches/RC/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -r8929 -r10194
--- branches/RC/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 8929)
+++ branches/RC/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 10194)
@@ -31,16 +31,19 @@
-
+
+