public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into readstories

Browse source 
* master:
  Fixing Subscribe button for tryfeeds.
  Fixing IFTTT saved story tags.
This commit is contained in:
Samuel Clay 2014-06-25 12:51:44 -07:00
commit aec8e36a80
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/oauth/views.py
View file

@ -334,7 +334,7 @@ def api_saved_tag_list(request):
tags = [] tags = []
for tag in starred_counts: for tag in starred_counts:
if tag['tag'] == "": continue if not tag['tag'] or tag['tag'] == "": continue
tags.append(dict(label="%s (%s %s)" % (tag['tag'], tag['count'], tags.append(dict(label="%s (%s %s)" % (tag['tag'], tag['count'],
'story' if tag['count'] == 1 else 'stories'), 'story' if tag['count'] == 1 else 'stories'),
value=tag['tag'])) value=tag['tag']))

4
media/js/newsblur/common/assetmodel.js
View file

@ -514,6 +514,10 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
} }
if (feed_id == this.feed_id) { if (feed_id == this.feed_id) {
if (data.feeds) { if (data.feeds) {
var river = _.any(['river:', 'social:'], function(prefix) {
return _.isString(feed_id) && _.string.startsWith(feed_id, prefix);
});
if (river) _.each(data.feeds, function(feed) { feed.temp = true; });
this.feeds.add(data.feeds); this.feeds.add(data.feeds);
} }
if (data.classifiers) { if (data.classifiers) {