diff --git a/modules/commons/commons_notify/commons_notify.features.field_instance.inc b/modules/commons/commons_notify/commons_notify.features.field_instance.inc index 57ff66e..aa5ed03 100644 --- a/modules/commons/commons_notify/commons_notify.features.field_instance.inc +++ b/modules/commons/commons_notify/commons_notify.features.field_instance.inc @@ -211,6 +211,207 @@ function commons_notify_field_default_field_instances() { ), ); + // Exported field_instance: 'message-commons_notify_comment_created_no_groups-field_message_rendered_body' + $field_instances['message-commons_notify_comment_created_no_groups-field_message_rendered_body'] = array( + 'bundle' => 'commons_notify_comment_created_no_groups', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 2, + ), + 'message_notify_email_body' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 4, + ), + 'message_notify_email_subject' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 4, + ), + ), + 'entity_type' => 'message', + 'field_name' => 'field_message_rendered_body', + 'label' => 'Body', + 'required' => 0, + 'settings' => array( + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'rows' => 5, + ), + 'type' => 'text_textarea', + 'weight' => 6, + ), + ); + + // Exported field_instance: 'message-commons_notify_comment_created_no_groups-field_message_rendered_subject' + $field_instances['message-commons_notify_comment_created_no_groups-field_message_rendered_subject'] = array( + 'bundle' => 'commons_notify_comment_created_no_groups', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 3, + ), + 'message_notify_email_body' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 3, + ), + 'message_notify_email_subject' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 3, + ), + ), + 'entity_type' => 'message', + 'field_name' => 'field_message_rendered_subject', + 'label' => 'Subject', + 'required' => FALSE, + 'settings' => array( + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'module' => 'text', + 'settings' => array( + 'size' => 60, + ), + 'type' => 'text_textfield', + 'weight' => 8, + ), + ); + + // Exported field_instance: 'message-commons_notify_comment_created_no_groups-field_target_comments' + $field_instances['message-commons_notify_comment_created_no_groups-field_target_comments'] = array( + 'bundle' => 'commons_notify_comment_created_no_groups', + 'default_value' => NULL, + 'default_value_function' => '', + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 1, + ), + 'message_notify_email_body' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 5, + ), + 'message_notify_email_subject' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 5, + ), + ), + 'entity_type' => 'message', + 'field_name' => 'field_target_comments', + 'label' => 'Target comment', + 'required' => 1, + 'settings' => array( + 'behaviors' => array( + 'prepopulate' => array( + 'status' => 0, + ), + ), + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'entityreference', + 'settings' => array( + 'match_operator' => 'CONTAINS', + 'path' => '', + 'size' => 60, + ), + 'type' => 'entityreference_autocomplete', + 'weight' => 4, + ), + ); + + // Exported field_instance: 'message-commons_notify_comment_created_no_groups-field_target_nodes' + $field_instances['message-commons_notify_comment_created_no_groups-field_target_nodes'] = array( + 'bundle' => 'commons_notify_comment_created_no_groups', + 'default_value' => NULL, + 'default_value_function' => '', + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 6, + ), + 'message_notify_email_subject' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 6, + ), + ), + 'entity_type' => 'message', + 'field_name' => 'field_target_nodes', + 'label' => 'Target nodes', + 'required' => 0, + 'settings' => array( + 'behaviors' => array( + 'prepopulate' => array( + 'status' => 0, + ), + ), + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'entityreference', + 'settings' => array( + 'match_operator' => 'CONTAINS', + 'path' => '', + 'size' => 60, + ), + 'type' => 'entityreference_autocomplete', + 'weight' => 2, + ), + ); + // Exported field_instance: 'message-commons_notify_node_created-field_message_rendered_body' $field_instances['message-commons_notify_node_created-field_message_rendered_body'] = array( 'bundle' => 'commons_notify_node_created', diff --git a/modules/commons/commons_notify/commons_notify.features.inc b/modules/commons/commons_notify/commons_notify.features.inc index 58233d0..8966da6 100644 --- a/modules/commons/commons_notify/commons_notify.features.inc +++ b/modules/commons/commons_notify/commons_notify.features.inc @@ -42,6 +42,33 @@ function commons_notify_default_message_type() { }, "rdf_mapping" : [] }'); + $items['commons_notify_comment_created_no_groups'] = entity_import('message_type', '{ + "name" : "commons_notify_comment_created_no_groups", + "description" : "Commons Notify: Comment created that is not in any groups", + "argument_keys" : [], + "argument" : [], + "category" : "commons_notify", + "data" : { + "token options" : { "clear" : 0 }, + "purge" : { "override" : 0, "enabled" : 0, "quota" : "", "days" : "" } + }, + "language" : "", + "arguments" : null, + "message_text" : { "und" : [ + { + "value" : "New comment on [message:field-target-nodes:0:title]", + "format" : "plain_text", + "safe_value" : "\\u003Cp\\u003ENew comment on [message:field-target-nodes:0:title]\\u003C\\/p\\u003E\\n" + }, + { + "value" : "Hi [message:user:name],\\r\\n\\r\\n[message:field-target-comments:0:author] commented on [message:field-target-nodes:0:title]:\\r\\n\\r\\n[message:field-target-comments:0:body]\\r\\n\\r\\nRead \\u0026 respond: [message:field-target-comments:0:url]\\r\\nUpdate your notification settings: [site:url]\\/user\\/[message:user:uid]\\/notification-settings", + "format" : "plain_text", + "safe_value" : "\\u003Cp\\u003EHi [message:user:name],\\u003C\\/p\\u003E\\n\\u003Cp\\u003E[message:field-target-comments:0:author] commented on [message:field-target-nodes:0:title]:\\u003C\\/p\\u003E\\n\\u003Cp\\u003E[message:field-target-comments:0:body]\\u003C\\/p\\u003E\\n\\u003Cp\\u003ERead \\u0026amp; respond: [message:field-target-comments:0:url]\\u003Cbr \\/\\u003E\\nUpdate your notification settings: [site:url]\\/user\\/[message:user:uid]\\/notification-settings\\u003C\\/p\\u003E\\n" + } + ] + }, + "rdf_mapping" : [] + }'); $items['commons_notify_node_created'] = entity_import('message_type', '{ "name" : "commons_notify_node_created", "description" : "The notification sent when a user creates a node.", diff --git a/modules/commons/commons_notify/commons_notify.info b/modules/commons/commons_notify/commons_notify.info index 7900e88..ec19525 100644 --- a/modules/commons/commons_notify/commons_notify.info +++ b/modules/commons/commons_notify/commons_notify.info @@ -25,6 +25,10 @@ features[field_instance][] = message-commons_notify_comment_created-field_messag features[field_instance][] = message-commons_notify_comment_created-field_message_rendered_subject features[field_instance][] = message-commons_notify_comment_created-field_target_comments features[field_instance][] = message-commons_notify_comment_created-field_target_nodes +features[field_instance][] = message-commons_notify_comment_created_no_groups-field_message_rendered_body +features[field_instance][] = message-commons_notify_comment_created_no_groups-field_message_rendered_subject +features[field_instance][] = message-commons_notify_comment_created_no_groups-field_target_comments +features[field_instance][] = message-commons_notify_comment_created_no_groups-field_target_nodes features[field_instance][] = message-commons_notify_node_created-field_message_rendered_body features[field_instance][] = message-commons_notify_node_created-field_message_rendered_subject features[field_instance][] = message-commons_notify_node_created-field_target_nodes @@ -35,10 +39,12 @@ features[field_instance][] = message-commons_notify_node_created_no_groups-field features[field_instance][] = message_type-commons_notify-message_text features[field_instance][] = user-user-message_subscribe_email features[message_type][] = commons_notify_comment_created +features[message_type][] = commons_notify_comment_created_no_groups features[message_type][] = commons_notify_node_created features[message_type][] = commons_notify_node_created_no_groups features[message_type_category][] = commons_notify features[variable][] = field_bundle_settings_message__commons_notify_comment_created +features[variable][] = field_bundle_settings_message__commons_notify_comment_created_no_groups features[variable][] = field_bundle_settings_message__commons_notify_node_created features[variable][] = field_bundle_settings_message__commons_notify_node_created_no_groups features[variable][] = message_subscribe_default_notifiers diff --git a/modules/commons/commons_notify/commons_notify.module b/modules/commons/commons_notify/commons_notify.module index 7be270c..93b5eb3 100644 --- a/modules/commons/commons_notify/commons_notify.module +++ b/modules/commons/commons_notify/commons_notify.module @@ -76,7 +76,7 @@ function commons_notify_comment_insert($comment) { $message_type = 'commons_notify_comment_created'; $hook = 'comment_insert'; if (!isset($node->og_group_ref[LANGUAGE_NONE][0]['target_id'])) { - $message_type = 'commons_notify_node_created_no_groups'; + $message_type = 'commons_notify_comment_created_no_groups'; } drupal_alter('commons_notify_message_selection', $message_type, $hook, $comment); $message = message_create($message_type, array('uid' => $account->uid, 'timestamp' => $comment->created)); diff --git a/modules/commons/commons_notify/commons_notify.strongarm.inc b/modules/commons/commons_notify/commons_notify.strongarm.inc index 7e4f9a6..7908a70 100644 --- a/modules/commons/commons_notify/commons_notify.strongarm.inc +++ b/modules/commons/commons_notify/commons_notify.strongarm.inc @@ -47,6 +47,40 @@ function commons_notify_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; + $strongarm->name = 'field_bundle_settings_message__commons_notify_comment_created_no_groups'; + $strongarm->value = array( + 'view_modes' => array(), + 'extra_fields' => array( + 'form' => array(), + 'display' => array( + 'message__message_text__0' => array( + 'message_notify_email_subject' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + ), + 'message__message_text__1' => array( + 'message_notify_email_subject' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + ), + ), + ), + ); + $export['field_bundle_settings_message__commons_notify_comment_created_no_groups'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; $strongarm->name = 'field_bundle_settings_message__commons_notify_node_created'; $strongarm->value = array( 'view_modes' => array(),