From 1207947afee4d7fbd2ee374339d5e84bb0528e9a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 12 Mar 2014 22:25:52 -0400
Subject: Fix TicketModel modList bug when a field was set multiple times

---
 src/main/java/com/gitblit/models/TicketModel.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/gitblit/models')

diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index fa09ec59..aced6d78 100644
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -785,7 +785,21 @@ public class TicketModel implements Serializable, Comparable<TicketModel> {
 			for (String item : items) {
 				list.add(prefix + item);
 			}
-			setField(field, join(list, ","));
+			if (hasField(field)) {
+				String flat = getString(field);
+				if (isEmpty(flat)) {
+					// field is empty, use this list
+					setField(field, join(list, ","));
+				} else {
+					// merge this list into the existing field list
+					Set<String> set = new TreeSet<String>(Arrays.asList(flat.split(",")));
+					set.addAll(list);
+					setField(field, join(set, ","));
+				}
+			} else {
+				// does not have a list for this field
+				setField(field, join(list, ","));
+			}
 		}
 
 		public String getId() {
-- 
cgit v1.2.3