diff options
| author | James Moger <james.moger@gitblit.com> | 2012-08-24 13:32:44 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-08-24 13:32:44 -0400 |
| commit | d97e52ef501a72fcf16aee02d7e79c91d123dfe6 (patch) | |
| tree | cb1046ec366308afbe452430b5d8370c9a76a131 /src/com/gitblit/wicket/pages/RepositoryPage.java | |
| parent | 60c3e51aaa0f3355a4d71bd04603f07d2507d316 (diff) | |
| download | gitblit-d97e52ef501a72fcf16aee02d7e79c91d123dfe6.tar.gz gitblit-d97e52ef501a72fcf16aee02d7e79c91d123dfe6.zip | |
Implemented custom request handling for (un)authenticated sessions to workaround Wicket bugs
Diffstat (limited to 'src/com/gitblit/wicket/pages/RepositoryPage.java')
| -rw-r--r-- | src/com/gitblit/wicket/pages/RepositoryPage.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 6d33a147..19a5de2c 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -151,7 +151,7 @@ public abstract class RepositoryPage extends BasePage { if (showAdmin
|| GitBlitWebSession.get().isLoggedIn()
&& (model.owner != null && model.owner.equalsIgnoreCase(GitBlitWebSession.get()
- .getUser().username))) {
+ .getUsername()))) {
pages.put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class, params));
}
return pages;
@@ -198,7 +198,13 @@ public abstract class RepositoryPage extends BasePage { RepositoryModel model = GitBlit.self().getRepositoryModel(
GitBlitWebSession.get().getUser(), repositoryName);
if (model == null) {
- authenticationError(getString("gb.unauthorizedAccessForRepository") + " " + repositoryName);
+ if (GitBlit.self().hasRepository(repositoryName)) {
+ // has repository, but unauthorized
+ authenticationError(getString("gb.unauthorizedAccessForRepository") + " " + repositoryName);
+ } else {
+ // does not have repository
+ error(getString("gb.canNotLoadRepository") + " " + repositoryName, true);
+ }
return null;
}
m = model;
|