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

Adding checks for feed in trainer, now that the trainer is doing double-duty for individual feeds and for the trainer itself.

Browse source
This commit is contained in:
Samuel Clay 2010-09-21 19:07:36 -04:00
parent 744745b3ee
commit 4ea886be15
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/reader/views.py
View file

@ -546,7 +546,7 @@ def save_feed_order(request):
@json.json_view
def get_feeds_trainer(request):
classifiers = []
feed_id = request.POST['feed_id']
feed_id = request.POST.get('feed_id')
usersubs = UserSubscription.objects.filter(user=request.user)
if feed_id:

9
media/js/newsblur/assetmodel.js
View file

@ -202,11 +202,14 @@ NEWSBLUR.AssetModel.Reader.prototype = {
get_feeds_trainer: function(feed_id, callback) {
var self = this;
var params = {};
if (feed_id) {
params['feed_id'] = feed_id;
}
if (NEWSBLUR.Globals.is_authenticated) {
this.make_request('/reader/get_feeds_trainer', {
'feed_id': feed_id
}, callback, null, {'ajax_group': 'feed'});
this.make_request('/reader/get_feeds_trainer', params, callback, null, {'ajax_group': 'feed'});
} else {
if ($.isFunction(callback)) callback();
}

2
media/js/newsblur/reader_classifier.js
View file

@ -135,6 +135,8 @@ var classifier = {
var trainer_data_length = this.trainer_data.length;
var trainer_data = this.trainer_data[this.trainer_iterator];
this.feed_id = trainer_data['feed_id'];
this.trainer_iterator = this.trainer_iterator + 1;
if (this.trainer_iterator > trainer_data_length) {
this.make_trainer_outro();