From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001 From: Fabrice Bacchella <fbacchella@spamcop.net> Date: Tue, 26 May 2015 04:48:40 -0400 Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString --- src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java index d3e493e..200c8dc 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java @@ -56,6 +56,9 @@ GitBlitWebSession session = GitBlitWebSession.get(); UserModel user = session.getUser(); + if (user == null) { + user = UserModel.ANONYMOUS; + } // build project set for repository destination String defaultPath = null; @@ -84,10 +87,11 @@ // set the defaultProject to the current repository project if (StringUtils.isEmpty(repository.projectPath)) { defaultPath = "/"; + defaultName = repository.name; } else { defaultPath = repository.projectPath + "/"; + defaultName = repository.name.substring(defaultPath.length()); } - defaultName = repository.name.substring(defaultPath.length()); pathNames.add(defaultPath); } -- Gitblit v1.9.1