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-72218 build.gradle #48631

Closed
wants to merge 18 commits into from
Closed

LPS-72218 build.gradle #48631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
812735f
LPS-72218 Adds new method to set add delete message
ealonso Apr 25, 2017
15fd11d
LPS-72218 Uses a var for isInTrash instead of getting the value multi…
ealonso Apr 25, 2017
4eba0d3
LPS-72218 Uses latest kernel version
ealonso Apr 25, 2017
e81fa08
LPS-72218 Uses TrashedModel interface to know if an entity is in trash
ealonso Apr 25, 2017
59cf44b
LPS-72218 Use addDeleteSuccessData with trashed models instead of usi…
ealonso Apr 25, 2017
1e8a513
LPS-72218 Used trashed models instead of arrays
ealonso Apr 25, 2017
174da49
LPS-72218 Copy method where it is used
ealonso Apr 25, 2017
9fc106d
LPS-72218 SF
ealonso Apr 25, 2017
974de77
LPS-72218 Copy orderByComparator method where it is used
ealonso Apr 25, 2017
f620a93
LPS-72218 Copy isValidTrashTitle where we use it
ealonso Apr 25, 2017
4266294
LPS-72218 Copy getViewURL to portlet provider
ealonso Apr 25, 2017
2ca92a6
LPS-72218 Uses methods defined in the same class
ealonso Apr 25, 2017
2956bfa
LPS-72218 Uses portlet provider to get the url
ealonso Apr 25, 2017
96874a3
LPS-72218 Uses portal reference instead of PortalUtil
ealonso Apr 25, 2017
15e5d2a
LPS-72218 Copy breadcrumb methods to TrashUtil in trash-web
ealonso Apr 26, 2017
3b00e2c
LPS-72218 Copy disable Trash method into TrashTestUtil since it is us…
ealonso Apr 26, 2017
467bc01
LPS-72218 Uses new method on trash-util-test
ealonso Apr 26, 2017
2970403
LPS-72218 build.gradle
ealonso Apr 26, 2017
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
13 changes: 6 additions & 7 deletions ...rc/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.servlet.SessionMessages;
import com.liferay.portal.kernel.servlet.taglib.ui.ImageSelector;
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.transaction.Propagation;
Expand All @@ -77,11 +76,12 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portlet.blogs.BlogsEntryAttachmentFileEntryReference;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;

import javax.portlet.ActionRequest;
Expand Down Expand Up @@ -145,12 +145,11 @@ protected void deleteEntries(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

SessionMessages.add(
actionRequest,
_portal.getPortletId(actionRequest) +
SessionMessages.KEY_SUFFIX_HIDE_DEFAULT_SUCCESS_MESSAGE);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/apps/collaboration/bookmarks/bookmarks-web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
provided group: "com.liferay", name: "com.liferay.portal.upgrade", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.trash.taglib", version: "2.0.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.7.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
provided group: "com.liferay.portal", name: "com.liferay.util.java", version: "2.0.0"
provided group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
Expand Down
9 changes: 6 additions & 3 deletions ...ain/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -116,9 +117,11 @@ protected void deleteEntry(ActionRequest actionRequest, boolean moveToTrash)
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
9 changes: 6 additions & 3 deletions ...in/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -88,9 +89,11 @@ protected void deleteFolders(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
9 changes: 6 additions & 3 deletions ...a/com/liferay/document/library/web/internal/portlet/action/EditEntryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -184,9 +185,11 @@ protected void deleteEntries(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
22 changes: 16 additions & 6 deletions ...m/liferay/document/library/web/internal/portlet/action/EditFileEntryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,15 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.util.PrefsPropsUtil;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.io.InputStream;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.portlet.ActionRequest;
Expand Down Expand Up @@ -378,14 +379,23 @@ protected void deleteFileEntry(

FileEntry fileEntry = _dlAppService.getFileEntry(fileEntryId);

if (fileEntry.isRepositoryCapabilityProvided(TrashCapability.class)) {
fileEntry = _dlTrashService.moveFileEntryToTrash(fileEntryId);
if (!fileEntry.isRepositoryCapabilityProvided(TrashCapability.class)) {
hideDefaultSuccessMessage(actionRequest);

TrashUtil.addTrashSessionMessages(
actionRequest, (TrashedModel)fileEntry.getModel());
return;
}

hideDefaultSuccessMessage(actionRequest);
fileEntry = _dlTrashService.moveFileEntryToTrash(fileEntryId);

List<TrashedModel> trashedModels = new ArrayList<>();

trashedModels.add((TrashedModel)fileEntry.getModel());

Map<String, Object> data = new HashMap<>();

data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}

protected void deleteTempFileEntry(
Expand Down
23 changes: 18 additions & 5 deletions ...iferay/document/library/web/internal/portlet/action/EditFileShortcutMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -65,12 +69,21 @@ protected void deleteFileShortcut(
FileShortcut fileShortcut = _dlTrashService.moveFileShortcutToTrash(
fileShortcutId);

if (fileShortcut.getModel() instanceof TrashedModel) {
TrashUtil.addTrashSessionMessages(
actionRequest, (TrashedModel)fileShortcut.getModel());
if (!(fileShortcut.getModel() instanceof TrashedModel)) {
hideDefaultSuccessMessage(actionRequest);

return;
}

hideDefaultSuccessMessage(actionRequest);
List<TrashedModel> trashedModels = new ArrayList<>();

trashedModels.add((TrashedModel)fileShortcut.getModel());

Map<String, Object> data = new HashMap<>();

data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
else {
_dlAppService.deleteFileShortcut(fileShortcutId);
Expand Down
9 changes: 6 additions & 3 deletions .../com/liferay/document/library/web/internal/portlet/action/EditFolderMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -125,9 +126,11 @@ protected void deleteFolders(
}

if (moveToTrash && (deleteFolderIds.length > 0)) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
10 changes: 6 additions & 4 deletions ...pps/collaboration/flags/flags-taglib/src/main/resources/META-INF/resources/flags/page.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,24 @@ long reportedUserId = GetterUtil.getLong((String)request.getAttribute("liferay-f

String cssClass = randomNamespace;

if (!TrashUtil.isInTrash(className, classPK)) {
boolean isInTrash = TrashUtil.isInTrash(className, classPK);

if (!isInTrash) {
cssClass = randomNamespace + " flag-enable";
}
%>

<div class="taglib-flags" title="<liferay-ui:message key='<%= !TrashUtil.isInTrash(className, classPK) ? message : "flags-are-disabled-because-this-entry-is-in-the-recycle-bin" %>' />">
<div class="taglib-flags" title="<liferay-ui:message key='<%= !isInTrash ? message : "flags-are-disabled-because-this-entry-is-in-the-recycle-bin" %>' />">
<liferay-ui:icon
cssClass="<%= cssClass %>"
iconCssClass="icon-flag"
label="<%= label %>"
message="<%= message %>"
url='<%= !TrashUtil.isInTrash(className, classPK) ? "javascript:;" : null %>'
url='<%= !isInTrash ? "javascript:;" : null %>'
/>
</div>

<c:if test="<%= !TrashUtil.isInTrash(className, classPK) %>">
<c:if test="<%= !isInTrash %>">
<c:choose>
<c:when test="<%= flagsGroupServiceConfiguration.guestUsersEnabled() || themeDisplay.isSignedIn() %>">
<aui:script use="aui-io-plugin-deprecated,aui-modal">
Expand Down
9 changes: 6 additions & 3 deletions .../com/liferay/message/boards/web/internal/portlet/action/DeleteThreadMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -83,9 +84,11 @@ protected void deleteThreads(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
9 changes: 6 additions & 3 deletions .../com/liferay/message/boards/web/internal/portlet/action/EditCategoryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -103,9 +104,11 @@ protected void deleteCategories(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
9 changes: 6 additions & 3 deletions ...ava/com/liferay/message/boards/web/internal/portlet/action/EditEntryMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.util.TrashUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -92,9 +93,11 @@ protected void deleteEntries(
}

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down
9 changes: 6 additions & 3 deletions .../src/main/java/com/liferay/wiki/web/internal/portlet/action/EditNodeMVCActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.kernel.service.TrashEntryService;
import com.liferay.trash.kernel.util.TrashUtil;
import com.liferay.wiki.constants.WikiPortletKeys;
import com.liferay.wiki.exception.DuplicateNodeNameException;
import com.liferay.wiki.exception.NoSuchNodeException;
Expand All @@ -47,7 +46,9 @@
import com.liferay.wiki.web.configuration.WikiPortletInstanceOverriddenConfiguration;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Expand Down Expand Up @@ -131,9 +132,11 @@ protected void deleteNode(ActionRequest actionRequest, boolean moveToTrash)
WikiCacheThreadLocal.setClearCache(true);

if (moveToTrash && !trashedModels.isEmpty()) {
TrashUtil.addTrashSessionMessages(actionRequest, trashedModels);
Map<String, Object> data = new HashMap<>();

hideDefaultSuccessMessage(actionRequest);
data.put("trashedModels", trashedModels);

addDeleteSuccessData(actionRequest, data);
}
}

Expand Down