From 2877fbe1ff4da228af9b7bb7928aff7d275292ae Mon Sep 17 00:00:00 2001 From: Jozef Chocholacek Date: Fri, 12 Dec 2014 23:08:56 +0100 Subject: [PATCH 1/3] LPS-52188 use folderId when moving messages --- portlets/mail-portlet/docroot/js/main.js | 2 +- portlets/mail-portlet/docroot/select_folder.jspf | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/portlets/mail-portlet/docroot/js/main.js b/portlets/mail-portlet/docroot/js/main.js index 904f307b0aaf..22c7c279b0b0 100644 --- a/portlets/mail-portlet/docroot/js/main.js +++ b/portlets/mail-portlet/docroot/js/main.js @@ -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(); diff --git a/portlets/mail-portlet/docroot/select_folder.jspf b/portlets/mail-portlet/docroot/select_folder.jspf index b03aa0374abf..93eb0c92de88 100644 --- a/portlets/mail-portlet/docroot/select_folder.jspf +++ b/portlets/mail-portlet/docroot/select_folder.jspf @@ -14,13 +14,17 @@ */ --%> +<%@page import="java.util.HashMap"%> +<%@page import="java.util.Map"%> <% List folders = FolderLocalServiceUtil.getFolders(accountId); +Map data = new HashMap(); for (Folder curFolder : folders) { + data.put("folderid", curFolder.getFolderId()); %> - + <% } From 1becc07251861fd60700ae76c9e344f2b68cd3ac Mon Sep 17 00:00:00 2001 From: Jozef Chocholacek Date: Fri, 12 Dec 2014 23:46:07 +0100 Subject: [PATCH 2/3] my local changes --- .gitignore | 9 ++++- build.properties | 14 ++++---- portlets/mail-portlet/.classpath | 59 +++++++++++++++++++------------- portlets/mail-portlet/.project | 34 +++++++++++++++--- 4 files changed, 80 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index bd612cdcdd5a..c0f7249c2a18 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ .sass-cache .sass_cache_*.css _sass_cache_*.css +.classpath +rebel.xml +.project /.bnd /.ivy @@ -23,6 +26,10 @@ _sass_cache_*.css /*/*/test-classes /*/*/test-results /*/*/tmp +/*/*/.settings +/*/*/.classpath +/*/*/.project + /*/*/docroot/WEB-INF/classes /*/*/docroot/WEB-INF/lib/portal-compat-shared.jar @@ -42,4 +49,4 @@ _sass_cache_*.css /themes/*/docroot/templates /themes/*/docroot/WEB-INF/lib -/tools/*/*/*/lib \ No newline at end of file +/tools/*/*/*/lib diff --git a/build.properties b/build.properties index b431be665e94..cfd85096ae17 100644 --- a/build.properties +++ b/build.properties @@ -108,7 +108,7 @@ # # Specify the paths to a WebLogic domain with Liferay installed. # - app.server.weblogic.dir=${app.server.parent.dir}/weblogic-10.3.6 + app.server.weblogic.dir=${app.server.parent.dir}/weblogic-12.1.2 app.server.weblogic.deploy.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy app.server.weblogic.lib.global.dir=${app.server.weblogic.dir}/domains/liferay/lib app.server.weblogic.portal.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy/ROOT @@ -289,12 +289,12 @@ ## Compiler ## - ant.build.javac.source=1.6 - ant.build.javac.target=1.6 + ant.build.javac.source=1.7 + ant.build.javac.target=1.7 #javac.compiler=com.google.errorprone.ErrorProneAntCompilerAdapter - #javac.compiler=modern - javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter + javac.compiler=modern + #javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter javac.debug=on javac.deprecation=off @@ -424,7 +424,7 @@ # Setting these attributes can limit it to just the plugins you're working # on. # - plugins.excludes=mentions-portlet,module-admin-portlet + plugins.excludes=module-admin-portlet plugins.includes=* # @@ -490,5 +490,5 @@ # # Set the version of Liferay Portal that these plugins are designed for. # - lp.version=6.2.0 + lp.version=7.0.0 lp.version.file.suffix= \ No newline at end of file diff --git a/portlets/mail-portlet/.classpath b/portlets/mail-portlet/.classpath index 74b4038a439d..98c22f682379 100644 --- a/portlets/mail-portlet/.classpath +++ b/portlets/mail-portlet/.classpath @@ -1,24 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portlets/mail-portlet/.project b/portlets/mail-portlet/.project index 012d8cbf329d..0c1cf457a0de 100644 --- a/portlets/mail-portlet/.project +++ b/portlets/mail-portlet/.project @@ -1,16 +1,42 @@ - mail-portlet-6.2.x - + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder - + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.zeroturnaround.eclipse.rebelXmlBuilder + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + org.zeroturnaround.eclipse.jrebelNature - \ No newline at end of file + From bfe27a0244c1161f723baa427128f70b98fd9f28 Mon Sep 17 00:00:00 2001 From: Jozef Chocholacek Date: Fri, 12 Dec 2014 23:59:27 +0100 Subject: [PATCH 3/3] Revert "my local changes" - this should not be in repo This reverts commit 1becc07251861fd60700ae76c9e344f2b68cd3ac. --- .gitignore | 9 +---- build.properties | 14 ++++---- portlets/mail-portlet/.classpath | 59 +++++++++++++------------------- portlets/mail-portlet/.project | 34 +++--------------- 4 files changed, 36 insertions(+), 80 deletions(-) diff --git a/.gitignore b/.gitignore index c0f7249c2a18..bd612cdcdd5a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,6 @@ .sass-cache .sass_cache_*.css _sass_cache_*.css -.classpath -rebel.xml -.project /.bnd /.ivy @@ -26,10 +23,6 @@ rebel.xml /*/*/test-classes /*/*/test-results /*/*/tmp -/*/*/.settings -/*/*/.classpath -/*/*/.project - /*/*/docroot/WEB-INF/classes /*/*/docroot/WEB-INF/lib/portal-compat-shared.jar @@ -49,4 +42,4 @@ rebel.xml /themes/*/docroot/templates /themes/*/docroot/WEB-INF/lib -/tools/*/*/*/lib +/tools/*/*/*/lib \ No newline at end of file diff --git a/build.properties b/build.properties index cfd85096ae17..b431be665e94 100644 --- a/build.properties +++ b/build.properties @@ -108,7 +108,7 @@ # # Specify the paths to a WebLogic domain with Liferay installed. # - app.server.weblogic.dir=${app.server.parent.dir}/weblogic-12.1.2 + app.server.weblogic.dir=${app.server.parent.dir}/weblogic-10.3.6 app.server.weblogic.deploy.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy app.server.weblogic.lib.global.dir=${app.server.weblogic.dir}/domains/liferay/lib app.server.weblogic.portal.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy/ROOT @@ -289,12 +289,12 @@ ## Compiler ## - ant.build.javac.source=1.7 - ant.build.javac.target=1.7 + ant.build.javac.source=1.6 + ant.build.javac.target=1.6 #javac.compiler=com.google.errorprone.ErrorProneAntCompilerAdapter - javac.compiler=modern - #javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter + #javac.compiler=modern + javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter javac.debug=on javac.deprecation=off @@ -424,7 +424,7 @@ # Setting these attributes can limit it to just the plugins you're working # on. # - plugins.excludes=module-admin-portlet + plugins.excludes=mentions-portlet,module-admin-portlet plugins.includes=* # @@ -490,5 +490,5 @@ # # Set the version of Liferay Portal that these plugins are designed for. # - lp.version=7.0.0 + lp.version=6.2.0 lp.version.file.suffix= \ No newline at end of file diff --git a/portlets/mail-portlet/.classpath b/portlets/mail-portlet/.classpath index 98c22f682379..74b4038a439d 100644 --- a/portlets/mail-portlet/.classpath +++ b/portlets/mail-portlet/.classpath @@ -1,35 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/portlets/mail-portlet/.project b/portlets/mail-portlet/.project index 0c1cf457a0de..012d8cbf329d 100644 --- a/portlets/mail-portlet/.project +++ b/portlets/mail-portlet/.project @@ -1,42 +1,16 @@ + mail-portlet-6.2.x - - + - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.zeroturnaround.eclipse.rebelXmlBuilder - - + - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - org.zeroturnaround.eclipse.jrebelNature - + \ No newline at end of file