diff options
author | Joel Johnson <mrjoel@lixil.net> | 2015-06-29 17:13:19 -0600 |
---|---|---|
committer | Joel Johnson <mrjoel@lixil.net> | 2015-07-01 13:05:50 -0600 |
commit | 1590fd791c7fc4d6849479cad88956f37360bbbf (patch) | |
tree | d2f524497419f6aaec22b8a91c0cdcba2c4c0580 /src/main/java/com/gitblit/models | |
parent | 124fd6e639b0bc43f3714134d6dead77895fd490 (diff) | |
download | gitblit-1590fd791c7fc4d6849479cad88956f37360bbbf.tar.gz gitblit-1590fd791c7fc4d6849479cad88956f37360bbbf.zip |
allow advertising gitblit privileges for external URLs
commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support
for hiding internal URLs, but didn't consider that it broke the
evaluation of permissions (used for tickets, etc.), and caused
a NPE on repoUrl.permission when trying to view the TicketPage.
With all internal mechanisms disabled, it would result in the
first URL being external with unknown permissions. This adds an
option to use internal permissions even for external URLs.
Note that this does not grant any additional permissions, but
does offer the option to have gitblit advertise the full set of
what is allowed, even if the external URL imposes additional
restrictions.
Diffstat (limited to 'src/main/java/com/gitblit/models')
-rw-r--r-- | src/main/java/com/gitblit/models/RepositoryUrl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/models/RepositoryUrl.java b/src/main/java/com/gitblit/models/RepositoryUrl.java index d155dbda..13f69175 100644 --- a/src/main/java/com/gitblit/models/RepositoryUrl.java +++ b/src/main/java/com/gitblit/models/RepositoryUrl.java @@ -41,8 +41,8 @@ public class RepositoryUrl implements Serializable { this.permission = permission;
}
- public boolean isExternal() {
- return permission == null;
+ public boolean hasPermission() {
+ return permission != null;
}
@Override
|