Download as
Browse Code »

Commit ba1782ccef410f186c1a4c87e01208e96fe9779a

Authored by Luan
1 parent b807eb35
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Changing rss feeds

Showing 1 changed file with 11 additions and 16 deletions   Show diff stats
src/rss/feeds.py
  Diff comments   View file @ba1782c
... ... @@ -4,9 +4,10 @@
4 4 from django.contrib.syndication.views import Feed
5 5 from django.utils.translation import ugettext as _
6 6  
  7 +from haystack.query import SearchQuerySet
  8 +
7 9 from super_archives.models import Thread
8 10 from super_archives import queries
9   -from colab.deprecated import solrutils
10 11  
11 12  
12 13 class LatestThreadsFeeds(Feed):
... ... @@ -21,7 +22,7 @@ class LatestThreadsFeeds(Feed):
21 22  
22 23 def item_title(self, item):
23 24 title = '[' + item.mailinglist.name + '] '
24   - title += item.latest_message.subject_clean
  25 + title += item.latest_message.subject_clean
25 26 return title
26 27  
27 28 def item_description(self, item):
... ... @@ -40,8 +41,8 @@ class HottestThreadsFeeds(Feed):
40 41  
41 42 def item_title(self, item):
42 43 title = '[' + item.mailinglist.name + '] '
43   - title += item.latest_message.subject_clean
44   - return title
  44 + title += item.latest_message.subject_clean
  45 + return title
45 46  
46 47 def item_description(self, item):
47 48 return item.latest_message.body
... ... @@ -52,28 +53,22 @@ class LatestColabFeeds(Feed):
52 53 link = '/rss/colab/latest/'
53 54  
54 55 def items(self):
55   - items = solrutils.get_latest_collaborations(20)
  56 + items = SearchQuerySet().all()[:20]
56 57 return items
57 58  
58 59 def item_title(self, item):
59   - type_ = item.get('Type') + ': '
60   - mailinglist = item.get('mailinglist')
  60 + type_ = item.type + ': '
  61 + mailinglist = item.tag
61 62  
62 63 if mailinglist:
63 64 prefix = type_ + mailinglist + ' - '
64 65 else:
65 66 prefix = type_
66 67  
67   - return prefix + item.get('Title')
  68 + return prefix + item.title
68 69  
69 70 def item_description(self, item):
70   - return item.get('Description')
  71 + return item.latest_description
71 72  
72 73 def item_link(self, item):
73   - if item.get('Type') != 'thread':
74   - url = item.get('url')
75   - else:
76   - url = 'http://colab.interlegis.leg.br'
77   - url += item.get('url')
78   - return url
79   -
  74 + return item.url
... ...