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-72044 Site members cannot view the Site Admin Portlet #48461

Closed
wants to merge 15 commits into from
Closed

LPS-72044 Site members cannot view the Site Admin Portlet #48461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0755301
subrepo:ignore Update 'modules/apps/web-experience/export-import/.git…
liferay-continuous-integration Apr 19, 2017
0f063d7
subrepo:ignore Update 'modules/apps/web-experience/nested-portlets/.g…
liferay-continuous-integration Apr 19, 2017
7cdd5fa
subrepo:ignore Update 'modules/apps/collaboration/blogs/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
872cd2d
subrepo:ignore Update 'modules/apps/collaboration/comment/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
ba22815
subrepo:ignore Update 'modules/apps/collaboration/document-library/.g…
liferay-continuous-integration Apr 19, 2017
1244e13
subrepo:ignore Update 'modules/apps/collaboration/mentions/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
c92565f
subrepo:ignore Update 'modules/apps/collaboration/subscription/.gitre…
liferay-continuous-integration Apr 19, 2017
d09b995
subrepo:ignore Update 'modules/apps/foundation/login/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
c9dd0d6
subrepo:ignore Update 'modules/apps/foundation/portal-security-sso/.g…
liferay-continuous-integration Apr 19, 2017
ba9008f
subrepo:ignore Update 'modules/apps/sync/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
43a8c02
subrepo:ignore Update 'modules/apps/web-experience/asset/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
1d8c72f
subrepo:ignore Update 'modules/apps/web-experience/product-navigation…
liferay-continuous-integration Apr 19, 2017
815e698
subrepo:ignore Update 'modules/apps/web-experience/site/.gitrepo'.
liferay-continuous-integration Apr 19, 2017
fbff680
LPS-72044 portal-kernel - BaseControlPanelEntry.java - restore call t…
drewbrokke Apr 19, 2017
0525178
LPS-72044 portal-kernel - BaseControlPanelEntry.java - removes deprec…
drewbrokke Apr 19, 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
4 changes: 2 additions & 2 deletions modules/apps/collaboration/blogs/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 9caa8b71b3db5bfb625d1d17040b06617f5edce9
commit = b07ed1bba4ef813e3354fbbce4519a1ee4713402
mergebuttonmergecommits = false
mode = push
parent = 76f0c5a03678911c3dfc08ea0db757bfed4f9243
parent = 0f063d7fcd8d38adadd33ccefa5b862a8fd7a32c
remote = git@github.com:liferay/com-liferay-blogs.git
4 changes: 2 additions & 2 deletions modules/apps/collaboration/comment/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 3517ff512295be940df60321ae2d040f4e182c26
commit = c27ebd5ee213abfb1e5ce05e25fa9d305a5ed844
mergebuttonmergecommits = false
mode = push
parent = 99a1598935f7b52781ac5d531d68f8cc8515322d
parent = 7cdd5fa0ab985d634a82c0487309f4218bd0c934
remote = git@github.com:liferay/com-liferay-comment.git
4 changes: 2 additions & 2 deletions modules/apps/collaboration/document-library/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 810e5665f145f7d6f303cb160b9124e4efaf8fb0
commit = 9f1c5f31784a51fdd316d4f3c994d45274967fe2
mergebuttonmergecommits = false
mode = push
parent = 62518bb506fb629259a54877d35aa3c3184b4d53
parent = 872cd2d4ad8f0f0fd093fcf8b60e1174c9f2e70b
remote = git@github.com:liferay/com-liferay-document-library.git
4 changes: 2 additions & 2 deletions modules/apps/collaboration/mentions/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = aa53f96df3ea59a9b5ff27191d954cc9d1bf6a16
commit = 77e6d1380f1cd2468f6ffe17efc2ed7651f2d357
mergebuttonmergecommits = false
mode = push
parent = dc8ce211409e25e5ef226506dec380b0ede8394f
parent = ba228152fd40711a89b7bce3f4a775f505da9286
remote = git@github.com:liferay/com-liferay-mentions.git
4 changes: 2 additions & 2 deletions modules/apps/collaboration/subscription/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = ad09eccd6a42ae954c30e7644cca2baf9e5bd0eb
commit = abc350c5b4e6d4cf8ce57b344c9f9d620aef6fae
mergebuttonmergecommits = false
mode = push
parent = 23f9654d0761f9b791bf0d312bc1fd84d9c6163d
parent = 1244e13447acd6fdc935acad0eb84cd29fb4fdb8
remote = git@github.com:liferay/com-liferay-subscription.git
4 changes: 2 additions & 2 deletions modules/apps/foundation/login/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 7f46c1aa92443941b34d382cb4549cdf27f6e4af
commit = 0b9611bec49159a84649e16629d88e66f8c3a39d
mergebuttonmergecommits = false
mode = push
parent = b59e9f7ee8196bebd8a3457e99fa9a1d66ab0d65
parent = c92565fd41d2172420c27b73d5ce7bb85eb7531e
remote = git@github.com:liferay/com-liferay-login.git
4 changes: 2 additions & 2 deletions modules/apps/foundation/portal-security-sso/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = f957baab8f2d5128a1113559f17d916f68bec534
commit = 9b901bddc66d3073f5529e38c03438f2ee305092
mergebuttonmergecommits = false
mode = push
parent = 8bdc0753ec8f78135b35b1584097f8fa0c439427
parent = d09b995264adc39c1aa9c63c10ab00879ba6c845
remote = git@github.com:liferay/com-liferay-portal-security-sso.git
4 changes: 2 additions & 2 deletions modules/apps/sync/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = a81404c7149e071818ee28a98a1ebdab4a5f3990
commit = fa873dba7572dcfd9aa0487e580bbf39ae1c1531
mergebuttonmergecommits = false
mode = push
parent = 201e59e3424419c3d454443625a5b2825676713a
parent = c9dd0d6a641d708c31651309b6e96f3f4d3eecca
remote = git@github.com:liferay/com-liferay-sync.git
4 changes: 2 additions & 2 deletions modules/apps/web-experience/asset/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = a905d87978a5e6c79a6132fece2acae23447d84b
commit = b537f293c8224b7701bb1e2311b01ccb46ff9ed9
mergebuttonmergecommits = false
mode = push
parent = 18b2c6670ff53eec8b14e3822788b895164c9f9a
parent = ba9008f7f4b125281991ef52b8eed5b95444775d
remote = git@github.com:liferay/com-liferay-asset.git
4 changes: 2 additions & 2 deletions modules/apps/web-experience/export-import/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 3b1d3e6d52de91d6dd6b67eeab3c84571927a3cd
commit = 4ac88da1db3230875cc8d6e0b306eb3b4a666370
mergebuttonmergecommits = false
mode = push
parent = 84e282e3f19f1d7078fbbaa3cfb64f80b2dba5a8
parent = e0782914a8e35b08102aa3f6f756cd9f8d7c24f2
remote = git@github.com:liferay/com-liferay-export-import.git
4 changes: 2 additions & 2 deletions modules/apps/web-experience/nested-portlets/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = ff7cc88c408f773d67871f308ce80d3ac4ec4388
commit = df117c28f6fa38dc6a4b82b7af3ca28b9c6bb632
mergebuttonmergecommits = false
mode = push
parent = e069cf95d23e6773eaad6815891198516f0f39f3
parent = 07553019effd91550a60eaa15d81bddaf0d30445
remote = git@github.com:liferay/com-liferay-nested-portlets.git
4 changes: 2 additions & 2 deletions modules/apps/web-experience/product-navigation/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 04e2b8940679d994aa12954e39d4b292bcc1ded3
commit = 155d74951ded9ff237366a195a9045d58fef8e44
mergebuttonmergecommits = false
mode = push
parent = e76d1616825b76af3c71f01dc1c3f5559c827485
parent = 43a8c023f79cd31fdb674ccc7fc2691d4bcadf4f
remote = git@github.com:liferay/com-liferay-product-navigation.git
4 changes: 2 additions & 2 deletions modules/apps/web-experience/site/.gitrepo
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
[subrepo]
autopull = false
cmdver = liferay
commit = 7697239e64e10315937d679c4fb24c19cacd3c0a
commit = bdd06a0468e804a92691ef73b54385cd8e687f1e
mergebuttonmergecommits = false
mode = push
parent = df37fb61d4ac2ddcc2c9577c3bd0e22a9234c2ca
parent = 1d8c72f92efcb3d2042b44b1ebb3a5a51afffb87
remote = git@github.com:liferay/com-liferay-site.git
21 changes: 7 additions & 14 deletions portal-kernel/src/com/liferay/portal/kernel/portlet/BaseControlPanelEntry.java
View file
Open in desktop
Expand Up @@ -42,7 +42,13 @@ public boolean hasAccessPermission(
return false;
}

return hasAccessPermissionExplicitlyGranted(
if (hasAccessPermissionExplicitlyGranted(
permissionChecker, group, portlet)) {

return true;
}

return hasPermissionImplicitlyGranted(
permissionChecker, group, portlet);
}

Expand Down Expand Up @@ -168,19 +174,6 @@ protected boolean hasAccessPermissionExplicitlyGranted(
return false;
}

/**
* @deprecated As of 7.0.0, with no direct replacement.<p>This method was
* originally defined to always display user portlets in the
* Control Panel. In this version, this method should always
* return <code>false</code> and remains only to
* preserve binary compatibility. This method will be
* permanently removed in a future version.</p><p>In lieu of
* this method, the ACCESS_IN_CONTROL_PANEL permission is used
* to determine if a portlet should be displayed in the Control
* Panel and is included in the User role by default for the
* portlets listed under the My Account category.</p>
*/
@Deprecated
protected boolean hasPermissionImplicitlyGranted(
PermissionChecker permissionChecker, Group group, Portlet portlet)
throws Exception {
Expand Down