Permalink
Browse files

LPS-26883

  • Loading branch information...
1 parent 55bbffa commit 5ee3dd206c6b95b020170cb81fb805c0586138ca @sara-liu sara-liu committed with Apr 28, 2012
@@ -117,7 +117,7 @@ boolean hasUnlinkLayoutSetPrototypePermission = PortalPermissionUtil.contains(pe
<liferay-ui:panel-container extended="<%= false %>">
<liferay-ui:panel collapsible="<%= true %>" defaultState='<%= ((group != null) && (group.getPublicLayoutsPageCount() > 0)) ? "open" : "closed" %>' title="public-pages">
<c:choose>
- <c:when test="<%= ((group == null) || (publicLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((group == null) || ((publicLayoutSetPrototype == null) && (group.getPublicLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select helpMessage="site-templates-with-an-incompatible-application-adapter-are-disabled" label="site-template" name="publicLayoutSetPrototypeId">
<aui:option label="none" selected="<%= true %>" value="" />
@@ -189,7 +189,7 @@ boolean hasUnlinkLayoutSetPrototypePermission = PortalPermissionUtil.contains(pe
</liferay-ui:panel>
<liferay-ui:panel collapsible="<%= true %>" defaultState='<%= ((group != null) && (group.getPrivateLayoutsPageCount() > 0)) ? "open" : "closed" %>' title="private-pages">
<c:choose>
- <c:when test="<%= ((group == null) || (privateLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((group == null) || ((privateLayoutSetPrototype == null) && (group.getPrivateLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select helpMessage="site-templates-with-an-incompatible-application-adapter-are-disabled" label="site-template" name="privateLayoutSetPrototypeId">
<aui:option label="none" selected="<%= true %>" value="" />
@@ -119,7 +119,7 @@ long userGroupId = BeanParamUtil.getLong(userGroup, request, "userGroupId");
%>
<c:choose>
- <c:when test="<%= ((userGroupGroup == null) || (publicLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((userGroupGroup == null) || ((publicLayoutSetPrototype == null) && (userGroupGroup.getPublicLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="public-pages" name="publicLayoutSetPrototypeId">
<aui:option label="none" selected="<%= true %>" value="" />
@@ -190,7 +190,7 @@ long userGroupId = BeanParamUtil.getLong(userGroup, request, "userGroupId");
</c:choose>
<c:choose>
- <c:when test="<%= ((userGroup == null) || (privateLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((userGroup == null) || ((privateLayoutSetPrototype == null) && (userGroupGroup.getPrivateLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="private-pages" name="privateLayoutSetPrototypeId">
<aui:option label="none" selected="<%= true %>" value="" />
@@ -80,7 +80,7 @@ if (organization != null) {
<div id="<portlet:namespace />siteTemplates">
<c:choose>
- <c:when test="<%= ((organization == null) || (publicLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((organization == null) || ((publicLayoutSetPrototype == null) && (organization.getPublicLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="public-pages" name="publicLayoutSetPrototypeId">
<aui:option label='<%= organization == null ? "default" : "none" %>' selected="<%= true %>" value="" />
@@ -125,7 +125,7 @@ if (organization != null) {
</c:choose>
<c:choose>
- <c:when test="<%= ((organization == null) || (privateLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((organization == null) || ((privateLayoutSetPrototype == null) && (organization.getPrivateLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="private-pages" name="privateLayoutSetPrototypeId">
<aui:option label='<%= organization == null ? "default" : "none" %>' selected="<%= true %>" value="" />
@@ -77,7 +77,7 @@ if (selUser != null) {
%>
<c:choose>
- <c:when test="<%= ((selUser == null) || (publicLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((selUser == null) || ((publicLayoutSetPrototype == null) && (selUser.getPublicLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="public-pages" name="publicLayoutSetPrototypeId">
<aui:option label='<%= selUser == null ? "default" : "none" %>' selected="<%= true %>" value="" />
@@ -147,7 +147,7 @@ if (selUser != null) {
</c:choose>
<c:choose>
- <c:when test="<%= ((selUser == null) || (privateLayoutSetPrototype == null)) && !layoutSetPrototypes.isEmpty() %>">
+ <c:when test="<%= ((selUser == null) || ((privateLayoutSetPrototype == null) && (selUser.getPrivateLayoutsPageCount() == 0))) && !layoutSetPrototypes.isEmpty() %>">
<aui:select label="private-pages" name="privateLayoutSetPrototypeId">
<aui:option label='<%= selUser == null ? "default" : "none" %>' selected="<%= true %>" value="" />

0 comments on commit 5ee3dd2

Please sign in to comment.