public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forcing merge_feeds to respect insertion order.

Browse source
This commit is contained in:
Samuel Clay 2010-12-23 17:09:08 -05:00
parent 35662d8e64
commit f0a75efe0a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/rss_feeds/models.py
View file

@ -958,10 +958,10 @@ class DuplicateFeed(models.Model):
duplicate_feed_id = models.CharField(max_length=255, null=True) duplicate_feed_id = models.CharField(max_length=255, null=True)
feed = models.ForeignKey(Feed, related_name='duplicate_addresses') feed = models.ForeignKey(Feed, related_name='duplicate_addresses')
def merge_feeds(original_feed_id, duplicate_feed_id): def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
from apps.reader.models import UserSubscription, UserSubscriptionFolders, MUserStory from apps.reader.models import UserSubscription, UserSubscriptionFolders, MUserStory
from apps.analyzer.models import MClassifierTitle, MClassifierAuthor, MClassifierFeed, MClassifierTag from apps.analyzer.models import MClassifierTitle, MClassifierAuthor, MClassifierFeed, MClassifierTag
if original_feed_id > duplicate_feed_id: if original_feed_id > duplicate_feed_id and not force:
original_feed_id, duplicate_feed_id = duplicate_feed_id, original_feed_id original_feed_id, duplicate_feed_id = duplicate_feed_id, original_feed_id
try: try:
original_feed = Feed.objects.get(pk=original_feed_id) original_feed = Feed.objects.get(pk=original_feed_id)

3
media/css/reader.css
View file

@ -2646,7 +2646,8 @@ a.NB-splash-link:hover {
color: #3F3D6E; color: #3F3D6E;
font-size: 10px; font-size: 10px;
font-weight: normal; font-weight: normal;
height: 11px; height: 12px;
line-height: 16px;
padding: 4px 0 4px 4px; padding: 4px 0 4px 4px;
overflow: hidden; overflow: hidden;
} }