Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-43579 Include more fields for mail notifications in blogs #16124

Closed
wants to merge 4 commits into from
Closed

LPS-43579 Include more fields for mail notifications in blogs #16124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
289ab8f
LPS-43579 Add the blog title as new variable to the blogs notifications
robertoDiaz Jan 20, 2014
e37be2d
LPS-43579 Add the new variable in the default templates
robertoDiaz Jan 20, 2014
e2898d0
LPS-43579 Include 2 more fields: description and content
Jan 20, 2014
0658b3d
LPS-43579 Move language description key to the section for sending em…
Jan 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion portal-impl/src/com/liferay/portlet/blogs/dependencies/email_entry_added_body.tmpl
View file
Open in desktop
@@ -1,6 +1,6 @@
Dear [$TO_NAME$],<br /><br />

[$BLOGS_ENTRY_USER_NAME$] created a new blog entry.<br /><br />
[$BLOGS_ENTRY_USER_NAME$] created a new blog entry titled [$BLOGS_ENTRY_TITLE$].<br /><br />

[$BLOGS_ENTRY_URL$]<br /><br />

Expand Down
2 changes: 1 addition & 1 deletion portal-impl/src/com/liferay/portlet/blogs/dependencies/email_entry_updated_body.tmpl
View file
Open in desktop
@@ -1,6 +1,6 @@
Dear [$TO_NAME$],<br /><br />

[$BLOGS_ENTRY_STATUS_BY_USER_NAME$] updated a blog entry.<br /><br />
[$BLOGS_ENTRY_STATUS_BY_USER_NAME$] updated a blog entry titled [$BLOGS_ENTRY_TITLE$].<br /><br />

[$BLOGS_ENTRY_URL$]<br /><br />

Expand Down
6 changes: 5 additions & 1 deletion portal-impl/src/com/liferay/portlet/blogs/service/impl/BlogsEntryLocalServiceImpl.java
View file
Open in desktop
Expand Up @@ -1420,8 +1420,12 @@ else if (serviceContext.isCommandUpdate() &&

subscriptionSender.setCompanyId(entry.getCompanyId());
subscriptionSender.setContextAttributes(
"[$BLOGS_ENTRY_DESCRIPTION$]", entry.getDescription(),
"[$BLOGS_ENTRY_STATUS_BY_USER_NAME$]", entry.getStatusByUserName(),
"[$BLOGS_ENTRY_URL$]", entryURL);
"[$BLOGS_ENTRY_TITLE$]", entry.getTitle(), "[$BLOGS_ENTRY_URL$]",
entryURL);
subscriptionSender.setContextAttribute(
"[$BLOGS_ENTRY_CONTENT$]", entry.getContent(), false);
subscriptionSender.setContextUserPrefix("BLOGS_ENTRY");
subscriptionSender.setFrom(fromAddress, fromName);
subscriptionSender.setHtmlFormat(true);
Expand Down
3 changes: 3 additions & 0 deletions portal-impl/src/content/Language.properties
View file
Open in desktop
Expand Up @@ -5597,6 +5597,9 @@ the-asset-could-not-be-found=The asset could not be found.
the-audio-preview-is-not-yet-ready.-please-try-again-later=The audio preview is not yet ready. Please try again later.
the-available-languages-in-the-lar-file-x-do-not-match-the-site's-available-languages-x=The available languages in the LAR file (<em>{0}</em>) do not match the site's available languages (<em>{1}</em>).
the-average-rating-is-x-stars-out-of-x=The average rating is {0} stars out of {1}.
the-blog-entry-content=The blog entry content
the-blog-entry-description=The blog entry description
the-blog-entry-title=The blog entry title
the-blog-entry-url=The blog entry URL
the-bookmark-entry-url=The bookmark entry URL
the-browser's-remote-address=The browser's remote address
Expand Down
30 changes: 24 additions & 6 deletions portal-web/docroot/html/portlet/blogs/configuration.jsp
View file
Open in desktop
Expand Up @@ -102,12 +102,6 @@ String socialBookmarkTypes = portletPreferences.getValue("socialBookmarksTypes",
</legend>

<dl>
<dt>
[$BLOGS_ENTRY_STATUS_BY_USER_NAME$]
</dt>
<dd>
<liferay-ui:message key="the-user-who-updated-the-blog-entry" />
</dd>
<dt>
[$BLOGS_ENTRY_USER_ADDRESS$]
</dt>
Expand Down Expand Up @@ -202,6 +196,30 @@ String socialBookmarkTypes = portletPreferences.getValue("socialBookmarksTypes",
</legend>

<dl>
<dt>
[$BLOGS_ENTRY_TITLE$]
</dt>
<dd>
<liferay-ui:message key="the-blog-entry-title" />
</dd>
<dt>
[$BLOGS_ENTRY_DESCRIPTION$]
</dt>
<dd>
<liferay-ui:message key="the-blog-entry-description" />
</dd>
<dt>
[$BLOGS_ENTRY_CONTENT$]
</dt>
<dd>
<liferay-ui:message key="the-blog-entry-content" />
</dd>
<dt>
[$BLOGS_ENTRY_STATUS_BY_USER_NAME$]
</dt>
<dd>
<liferay-ui:message key="the-user-who-updated-the-blog-entry" />
</dd>
<dt>
[$BLOGS_ENTRY_USER_ADDRESS$]
</dt>
Expand Down