garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

actually add the feeds to the list

Browse Source
This commit is contained in:
Athou
2013-07-08 19:01:08 +02:00
parent b6b4395b91
commit bd047efcd2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -156,7 +156,14 @@ public class FeedDAO extends GenericDAO<Feed> {
for (String hash : normalizedUrlHashes) { for (String hash : normalizedUrlHashes) {
FeedCount fc = new FeedCount(); FeedCount fc = new FeedCount();
fc.normalizedUrlHash = hash; 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; return result;
} }

7
src/main/webapp/templates/admin.duplicate_feeds.html
View File

@@ -21,12 +21,13 @@
<div ui-if="current"> <div ui-if="current">
<div> <div>
Merge 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"> ng-options="feed.id as feed.url for feed in current.feeds">
</select> </select>
</div>
<div>
Into 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> </select>
</div> </div>
<input type="button" class="btn" ng-click="merge()" value="Merge" /> <input type="button" class="btn" ng-click="merge()" value="Merge" />