LPS-55718

modules/apps/item-selector/item-selector-criteria-api/bnd.bnd

@@ -3,5 +3,6 @@ Bundle-SymbolicName: com.liferay.item.selector.criteria.api
 Bundle-Version: 1.0.0
 Export-Package:\
 	com.liferay.item.selector.criteria.file.criterion,\
-	com.liferay.item.selector.criteria.image.criterion
+	com.liferay.item.selector.criteria.image.criterion,\
+	com.liferay.item.selector.criteria.url.criterion
 Include-Resource: classes

modules/apps/item-selector/item-selector-criteria-api/src/com/liferay/item/selector/criteria/url/criterion/URLItemSelectorCriterion.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.item.selector.criteria.url.criterion;
+
+import com.liferay.item.selector.BaseItemSelectorCriterion;
+
+import java.net.URL;
+
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * @author Roberto Díaz
+ */
+public class URLItemSelectorCriterion extends BaseItemSelectorCriterion {
+
+	public URLItemSelectorCriterion() {
+		super(_AVAILABLE_RETURN_TYPES);
+	}
+
+	private static final Set<Class<?>> _AVAILABLE_RETURN_TYPES =
+		getInmutableSet(URL.class, UUID.class);
+
+}

modules/apps/item-selector/item-selector-criteria-api/src/com/liferay/item/selector/criteria/url/handler/URLItemSelectorCriterionHandler.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.item.selector.criteria.url.handler;
+
+import com.liferay.item.selector.BaseItemSelectorCriterionHandler;
+import com.liferay.item.selector.ItemSelectorCriterionHandler;
+import com.liferay.item.selector.criteria.url.criterion.URLItemSelectorCriterion;
+
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * @author Roberto Díaz
+ */
+@Component(service = ItemSelectorCriterionHandler.class)
+public class URLItemSelectorCriterionHandler
+	extends BaseItemSelectorCriterionHandler<URLItemSelectorCriterion> {
+
+	@Override
+	public Class<URLItemSelectorCriterion> getItemSelectorCriterionClass() {
+		return URLItemSelectorCriterion.class;
+	}
+
+}

modules/apps/productivity-center/productivity-center-web/src/META-INF/resources/layout/view/user_personal_panel.jsp

@@ -32,4 +32,8 @@
 			</aui:row>
 		</aui:container>
 	</c:otherwise>
-</c:choose>
+</c:choose>
+
+<form action="#" id="hrefFm" method="post" name="hrefFm">
+	<span></span>
+</form>

modules/apps/roles/roles-selector-web/src/META-INF/resources/init.jsp

@@ -45,7 +45,6 @@ page import="com.liferay.portal.service.UserLocalServiceUtil" %><%@
 page import="com.liferay.portlet.PortletURLUtil" %><%@
 page import="com.liferay.portlet.rolesadmin.search.RoleSearch" %><%@
 page import="com.liferay.portlet.rolesadmin.search.RoleSearchTerms" %><%@
-page import="com.liferay.portlet.sites.action.ActionUtil" %><%@
 page import="com.liferay.portlet.sites.search.OrganizationRoleUserChecker" %><%@
 page import="com.liferay.portlet.sites.search.UserGroupGroupRoleUserGroupChecker" %><%@
 page import="com.liferay.portlet.sites.search.UserGroupRoleUserChecker" %><%@

modules/apps/roles/roles-selector-web/src/META-INF/resources/view.jsp

@@ -33,7 +33,9 @@ if (group != null) {
 
 String groupDescriptiveName = group.getDescriptiveName(locale);
 
-Role role = ActionUtil.getRole(request);
+long roleId = ParamUtil.getLong(request, "roleId");
+
+Role role = RoleLocalServiceUtil.fetchRole(roleId);
 
 if (role != null) {
 	String roleName = role.getName();
@@ -43,8 +45,6 @@ if (role != null) {
 	}
 }
 
-long roleId = BeanParamUtil.getLong(role, request, "roleId");
-
 int roleType = ParamUtil.getInteger(request, "roleType", RoleConstants.TYPE_SITE);
 
 Organization organization = null;

modules/apps/site/site-teams-web/src/META-INF/resources/edit_team_assignments.jsp

@@ -30,6 +30,10 @@ Team team = TeamLocalServiceUtil.fetchTeam(teamId);
 
 Group group = GroupLocalServiceUtil.getGroup(team.getGroupId());
 
+if (group != null) {
+	group = StagingUtil.getLiveGroup(group.getGroupId());
+}
+
 Organization organization = null;
 
 if (group.isOrganization()) {

modules/apps/site/site-teams-web/src/META-INF/resources/edit_team_assignments_users.jsp

@@ -24,6 +24,8 @@ int cur = (Integer)request.getAttribute("edit_team_assignments.jsp-cur");
 
 String redirect = (String)request.getAttribute("edit_team_assignments.jsp-redirect");
 
+Group group = (Group)request.getAttribute("edit_team_assignments.jsp-group");
+
 Team team = (Team)request.getAttribute("edit_team_assignments.jsp-team");
 
 PortletURL portletURL = (PortletURL)request.getAttribute("edit_team_assignments.jsp-portletURL");
@@ -58,7 +60,7 @@ PortletURL portletURL = (PortletURL)request.getAttribute("edit_team_assignments.
 	LinkedHashMap<String, Object> userParams = new LinkedHashMap<String, Object>();
 
 	userParams.put("inherit", Boolean.TRUE);
-	userParams.put("usersGroups", team.getGroupId());
+	userParams.put("usersGroups", group.getGroupId());
 
 	if (tabs2.equals("current")) {
 		userParams.put("usersTeams", team.getTeamId());

modules/apps/site/site-teams-web/src/META-INF/resources/init.jsp

@@ -32,6 +32,7 @@ page import="com.liferay.portal.kernel.dao.search.ResultRow" %><%@
 page import="com.liferay.portal.kernel.dao.search.SearchContainer" %><%@
 page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
 page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@
+page import="com.liferay.portal.kernel.staging.StagingUtil" %><%@
 page import="com.liferay.portal.kernel.util.ArrayUtil" %><%@
 page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@
 page import="com.liferay.portal.kernel.util.ParamUtil" %><%@

portal-impl/src/com/liferay/portal/model/impl/CountryImpl.java

@@ -24,6 +24,7 @@
  * @author Brian Wing Shun Chan
  * @author Hugo Huijser
  */
+@JSON(strict = true)
 public class CountryImpl extends CountryBaseImpl {
 
 	@Override

portal-impl/src/com/liferay/portal/service/http/RoleServiceHttp.java

@@ -653,6 +653,37 @@ public static com.liferay.portal.model.Role updateRole(
 		}
 	}
 
+	public static com.liferay.portal.model.Role fetchRole(
+		HttpPrincipal httpPrincipal, long roleId)
+		throws com.liferay.portal.kernel.exception.PortalException {
+		try {
+			MethodKey methodKey = new MethodKey(RoleServiceUtil.class,
+					"fetchRole", _fetchRoleParameterTypes20);
+
+			MethodHandler methodHandler = new MethodHandler(methodKey, roleId);
+
+			Object returnObj = null;
+
+			try {
+				returnObj = TunnelUtil.invoke(httpPrincipal, methodHandler);
+			}
+			catch (Exception e) {
+				if (e instanceof com.liferay.portal.kernel.exception.PortalException) {
+					throw (com.liferay.portal.kernel.exception.PortalException)e;
+				}
+
+				throw new com.liferay.portal.kernel.exception.SystemException(e);
+			}
+
+			return (com.liferay.portal.model.Role)returnObj;
+		}
+		catch (com.liferay.portal.kernel.exception.SystemException se) {
+			_log.error(se, se);
+
+			throw se;
+		}
+	}
+
 	private static Log _log = LogFactoryUtil.getLog(RoleServiceHttp.class);
 	private static final Class<?>[] _addRoleParameterTypes0 = new Class[] {
 			java.lang.String.class, long.class, java.lang.String.class,
@@ -720,4 +751,7 @@ public static com.liferay.portal.model.Role updateRole(
 			java.util.Map.class, java.lang.String.class,
 			com.liferay.portal.service.ServiceContext.class
 		};
+	private static final Class<?>[] _fetchRoleParameterTypes20 = new Class[] {
+			long.class
+		};
 }

portal-impl/src/com/liferay/portal/service/http/RoleServiceSoap.java

@@ -521,5 +521,19 @@ public static com.liferay.portal.model.RoleSoap updateRole(long roleId,
 		}
 	}
 
+	public static com.liferay.portal.model.RoleSoap fetchRole(long roleId)
+		throws RemoteException {
+		try {
+			com.liferay.portal.model.Role returnValue = RoleServiceUtil.fetchRole(roleId);
+
+			return com.liferay.portal.model.RoleSoap.toSoapModel(returnValue);
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+
+			throw new RemoteException(e.getMessage());
+		}
+	}
+
 	private static Log _log = LogFactoryUtil.getLog(RoleServiceSoap.class);
 }

portal-impl/src/com/liferay/portal/service/impl/PortletPreferencesLocalServiceStagingAdvice.java

@@ -23,7 +23,6 @@
 import com.liferay.portal.model.LayoutRevision;
 import com.liferay.portal.model.PortletPreferencesIds;
 import com.liferay.portal.model.User;
-import com.liferay.portal.model.UserConstants;
 import com.liferay.portal.security.auth.PrincipalThreadLocal;
 import com.liferay.portal.service.LayoutLocalServiceUtil;
 import com.liferay.portal.service.LayoutRevisionLocalServiceUtil;
@@ -217,14 +216,13 @@ protected Object getPreferences(MethodInvocation methodInvocation)
 			return methodInvocation.proceed();
 		}
 
-		long userId = PrincipalThreadLocal.getUserId();
+		User user = UserLocalServiceUtil.fetchUser(
+			PrincipalThreadLocal.getUserId());
 
-		if (userId == UserConstants.USER_ID_DEFAULT) {
+		if ((user == null) || user.isDefaultUser()) {
 			plid = layoutRevision.getLayoutRevisionId();
 		}
 		else {
-			User user = UserLocalServiceUtil.getUserById(userId);
-
 			plid = StagingUtil.getRecentLayoutRevisionId(
 				user, layoutRevision.getLayoutSetBranchId(),
 				layoutRevision.getPlid());

portal-impl/src/com/liferay/portal/service/impl/RoleServiceImpl.java

@@ -170,6 +170,14 @@ public void deleteRole(long roleId) throws PortalException {
 		roleLocalService.deleteRole(roleId);
 	}
 
+	@Override
+	public Role fetchRole(long roleId) throws PortalException {
+		RolePermissionUtil.check(
+			getPermissionChecker(), roleId, ActionKeys.VIEW);
+
+		return roleLocalService.fetchRole(roleId);
+	}
+
 	/**
 	 * Returns all the roles associated with the group.
 	 *

portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java

@@ -21,7 +21,6 @@
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.servlet.BrowserSniffer;
 import com.liferay.portal.kernel.servlet.BufferCacheServletResponse;
-import com.liferay.portal.kernel.servlet.FileTimestampUtil;
 import com.liferay.portal.kernel.servlet.HttpHeaders;
 import com.liferay.portal.kernel.servlet.PortalWebResourceConstants;
 import com.liferay.portal.kernel.servlet.PortalWebResourcesUtil;
@@ -281,21 +280,10 @@ protected Object getBundleContent(
 		File cacheFile = new File(_tempDir, cacheFileName);
 
 		if (cacheFile.exists()) {
-			boolean staleCache = false;
-
-			for (String fileName : fileNames) {
-				long lastModified = FileTimestampUtil.getTimestamp(
-					jsServletContext,
-					bundleDirName.concat(StringPool.SLASH).concat(fileName));
-
-				if (lastModified > cacheFile.lastModified()) {
-					staleCache = true;
-
-					break;
-				}
-			}
+			long lastModified = PortalWebResourcesUtil.getLastModified(
+				PortalWebResourceConstants.RESOURCE_TYPE_JS);
 
-			if (!staleCache) {
+			if (lastModified <= cacheFile.lastModified()) {
 				response.setContentType(ContentTypes.TEXT_JAVASCRIPT);
 
 				return cacheFile;

portal-impl/src/com/liferay/portal/struts/BaseFindActionHelper.java

@@ -99,8 +99,7 @@ public void execute(
 			PortletURL portletURL = PortletURLFactoryUtil.create(
 				request, portletId, plid, PortletRequest.RENDER_PHASE);
 
-			portletURL.setParameter(
-				"struts_action", getStrutsAction(request, portletId));
+			addRequiredParameters(request, portletId, portletURL);
 
 			boolean inheritRedirect = ParamUtil.getBoolean(
 				request, "inheritRedirect");
@@ -158,10 +157,6 @@ public void execute(
 	@Override
 	public abstract String getPrimaryKeyParameterName();
 
-	@Override
-	public abstract String getStrutsAction(
-		HttpServletRequest request, String portletId);
-
 	@Override
 	public abstract String[] initPortletIds();
 
@@ -324,6 +319,9 @@ protected BaseFindActionHelper() {
 		}
 	}
 
+	protected abstract void addRequiredParameters(
+		HttpServletRequest request, String portletId, PortletURL portletURL);
+
 	private static final Log _log = LogFactoryUtil.getLog(
 		BaseFindActionHelper.class);
 

portal-impl/src/com/liferay/portal/struts/BaseStrutsPortletFindActionHelper.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.struts;
+
+import javax.portlet.PortletURL;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Adolfo Pérez
+ */
+public abstract class BaseStrutsPortletFindActionHelper
+	extends BaseFindActionHelper implements StrutsPortletFindActionHelper {
+
+	@Override
+	public abstract String getStrutsAction(
+		HttpServletRequest request, String portletId);
+
+	@Override
+	protected void addRequiredParameters(
+		HttpServletRequest request, String portletId, PortletURL portletURL) {
+
+		portletURL.setParameter(
+			"struts_action", getStrutsAction(request, portletId));
+	}
+
+}

portal-impl/src/com/liferay/portal/struts/FindAction.java

@@ -30,7 +30,7 @@
 public abstract class FindAction extends Action {
 
 	public FindAction() {
-		_findActionHelper = new BaseFindActionHelper() {
+		_findActionHelper = new BaseStrutsPortletFindActionHelper() {
 
 			@Override
 			public long getGroupId(long primaryKey) throws Exception {