From bd047efcd2c2af280946a798c7271fcc3b7f6b36 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 8 Jul 2013 19:01:08 +0200
Subject: [PATCH] actually add the feeds to the list

---
 src/main/java/com/commafeed/backend/dao/FeedDAO.java | 9 ++++++++-
 src/main/webapp/templates/admin.duplicate_feeds.html | 7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java
index 8a08ec43..6b101435 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java
@@ -156,7 +156,14 @@ public class FeedDAO extends GenericDAO<Feed> {
 		for (String hash : normalizedUrlHashes) {
 			FeedCount fc = new FeedCount();
 			fc.normalizedUrlHash = hash;
-			fc.feeds = findByField(Feed_.normalizedUrlHash, hash);
+			fc.feeds = Lists.newArrayList();
+			for (Feed feed : findByField(Feed_.normalizedUrlHash, hash)) {
+				Feed f = new Feed();
+				f.setId(feed.getId());
+				f.setUrl(feed.getUrl());
+				fc.feeds.add(f);
+			}
+			result.add(fc);
 		}
 		return result;
 	}
diff --git a/src/main/webapp/templates/admin.duplicate_feeds.html b/src/main/webapp/templates/admin.duplicate_feeds.html
index b0185e80..6e2d10d6 100644
--- a/src/main/webapp/templates/admin.duplicate_feeds.html
+++ b/src/main/webapp/templates/admin.duplicate_feeds.html
@@ -21,12 +21,13 @@
 	<div ui-if="current">
 		<div>
 			Merge
-			<select ng-model="mergeData.feedIds" size="15" multiple="multiple" 
+			<select ng-model="mergeData.feedIds" size="30" multiple="multiple" class="input-block-level" 
 				ng-options="feed.id as feed.url for feed in current.feeds">
 			</select>
-			
+		</div>
+		<div>
 			Into
-			<select ng-model="mergeData.intoFeedId" ng-options="feed.id as feed.url for feed in current.feeds">
+			<select ng-model="mergeData.intoFeedId" ng-options="feed.id as feed.url for feed in current.feeds" class="input-block-level">
 			</select>
 		</div>
 		<input type="button" class="btn" ng-click="merge()" value="Merge" />