From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/models/UserPreferences.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index baab071..90c034f 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -23,6 +23,7 @@
import java.util.Map;
import java.util.TreeMap;
+import com.gitblit.Constants.Transport;
import com.gitblit.utils.StringUtils;
/**
@@ -37,7 +38,11 @@
public final String username;
- public String locale;
+ private String locale;
+
+ private Boolean emailMeOnMyTicketChanges;
+
+ private Transport transport;
private final Map<String, UserRepositoryPreferences> repositoryPreferences = new TreeMap<String, UserRepositoryPreferences>();
@@ -49,7 +54,17 @@
if (StringUtils.isEmpty(locale)) {
return null;
}
+ int underscore = locale.indexOf('_');
+ if (underscore > 0) {
+ String lang = locale.substring(0, underscore);
+ String cc = locale.substring(underscore + 1);
+ return new Locale(lang, cc);
+ }
return new Locale(locale);
+ }
+
+ public void setLocale(String locale) {
+ this.locale = locale;
}
public UserRepositoryPreferences getRepositoryPreferences(String repositoryName) {
@@ -90,4 +105,23 @@
Collections.sort(list);
return list;
}
+
+ public boolean isEmailMeOnMyTicketChanges() {
+ if (emailMeOnMyTicketChanges == null) {
+ return true;
+ }
+ return emailMeOnMyTicketChanges;
+ }
+
+ public void setEmailMeOnMyTicketChanges(boolean value) {
+ this.emailMeOnMyTicketChanges = value;
+ }
+
+ public Transport getTransport() {
+ return transport;
+ }
+
+ public void setTransport(Transport transport) {
+ this.transport = transport;
+ }
}
--
Gitblit v1.9.1