Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

6.2.x #167

Open
wants to merge 3 commits into
base: 6.2.x
Choose a base branch
from
Open

6.2.x #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2877fbe
LPS-52188 use folderId when moving messages
jchocholacek Dec 12, 2014
1becc07
my local changes
jchocholacek Dec 12, 2014
bfe27a0
Revert "my local changes" - this should not be in repo
jchocholacek Dec 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion portlets/mail-portlet/docroot/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ AUI.add(
instance.messagesContainer.all('.move-messages').on(
'click',
function(event) {
var folderId = A.Lang.String.trim(event.currentTarget.text());
var folderId = A.Lang.String.trim(event.currentTarget.getData('folderid'));

var messageIds = instance._getSelectedMessageIds();

Expand Down
6 changes: 5 additions & 1 deletion portlets/mail-portlet/docroot/select_folder.jspf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,17 @@
*/
--%>

<%@page import="java.util.HashMap"%>
<%@page import="java.util.Map"%>
<%
List<Folder> folders = FolderLocalServiceUtil.getFolders(accountId);
Map<String, Long> data = new HashMap<String, Long>();

for (Folder curFolder : folders) {
data.put("folderid", curFolder.getFolderId());
%>

<aui:nav-item cssClass="move-messages" label="<%= curFolder.getDisplayName() %>" />
<aui:nav-item cssClass="move-messages" label="<%= curFolder.getDisplayName() %>" data="<%= data %>" />

<%
}
Expand Down