Allow global_merge_vars to be merged in with the per message dict, with keys in the latter taking precedent.

Update the docs accordingly.
This commit is contained in:
William Hector
2015-07-14 05:57:12 +01:00
parent 883b23362c
commit 7179734a08
4 changed files with 28 additions and 4 deletions

View File

@@ -118,6 +118,10 @@ using :setting:`MANDRILL_SETTINGS`. For Example::
'track_opens': True,
}
.. note::
``merge_vars`` and ``recipient_metadata`` cannot be set globally. ``global_merge_vars`` is merged
(see :attribute:`global_merge_vars`)
.. These attributes are in the same order as they appear in the Mandrill API docs...
.. attribute:: important
@@ -211,6 +215,10 @@ using :setting:`MANDRILL_SETTINGS`. For Example::
Merge data must be strings or other JSON-serializable types.
(See :ref:`formatting-merge-data` for details.)
.. note::
If using :setting:`MANDRILL_SETTINGS` then the message ``dict`` will be merged and overwrite any duplicates.
.. attribute:: merge_vars
``dict``: per-recipient merge variables (most useful with :ref:`mandrill-templates`). The keys