diff options
| author | Florian Zschocke <florian.zschocke@cycos.com> | 2013-07-10 09:14:29 +0200 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@cycos.com> | 2013-08-26 12:30:53 +0200 |
| commit | cb946fa57e9dd4ca0853f079331c73dc0331c1e7 (patch) | |
| tree | 50c94e40a79dbff7bc0c2e3420bc4d5220f66d70 /src/main/java/com/gitblit/models/UserModel.java | |
| parent | 8eaf843d60983d433435ac2a89e1a63b8de02338 (diff) | |
| download | gitblit-cb946fa57e9dd4ca0853f079331c73dc0331c1e7.tar.gz gitblit-cb946fa57e9dd4ca0853f079331c73dc0331c1e7.zip | |
Refactor logic for user repository path into one class.
Gather logic for building the path/name of a personal user repository into one class.
Diffstat (limited to 'src/main/java/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/main/java/com/gitblit/models/UserModel.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index 6d585127..d785ae9e 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -35,6 +35,7 @@ import com.gitblit.Constants.PermissionType; import com.gitblit.Constants.RegistrantType;
import com.gitblit.Constants.Unused;
import com.gitblit.utils.ArrayUtils;
+import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -567,7 +568,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
if (canCreate) {
String projectPath = StringUtils.getFirstPathElement(repository);
- if (!StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username)) {
+ if (!StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase(getPersonalPath())) {
// personal repository
return true;
}
@@ -609,7 +610,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
public String getPersonalPath() {
- return "~" + username;
+ return ModelUtils.getPersonalPath(username);
}
public UserPreferences getPreferences() {
@@ -675,6 +676,6 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public boolean isMyPersonalRepository(String repository) {
String projectPath = StringUtils.getFirstPathElement(repository);
- return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username);
+ return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase(getPersonalPath());
}
}
|