dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show suggestions if there aren't any. fix #2153

Browse Source
This commit is contained in:
Ruud
2013-09-22 10:47:13 +02:00
parent 03700e0a04
commit 2365e1859f
2 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/suggestion/main.py
+1 -1
View File
@@ -102,6 +102,6 @@ class Suggestion(Plugin):
if suggestions: if suggestions:
new_suggestions.extend(suggestions) new_suggestions.extend(suggestions)
self.setCache('suggestion_cached', new_suggestions, timeout = 6048000) self.setCache('suggestion_cached', new_suggestions, timeout = 3024000)
return new_suggestions return new_suggestions
couchpotato/core/plugins/suggestion/static/suggest.js
+47 -42
View File
@@ -58,54 +58,59 @@ var SuggestList = new Class({
var self = this; var self = this;
if(!json) return; if(!json || json.count == 0){
self.el.hide();
}
else {
Object.each(json.suggestions, function(movie){ Object.each(json.suggestions, function(movie){
var m = new Block.Search.Item(movie, { var m = new Block.Search.Item(movie, {
'onAdded': function(){ 'onAdded': function(){
self.afterAdded(m, movie) self.afterAdded(m, movie)
} }
}); });
m.data_container.grab( m.data_container.grab(
new Element('div.actions').adopt( new Element('div.actions').adopt(
new Element('a.add.icon2', { new Element('a.add.icon2', {
'title': 'Add movie with your default quality', 'title': 'Add movie with your default quality',
'data-add': movie.imdb, 'data-add': movie.imdb,
'events': { 'events': {
'click': m.showOptions.bind(m) 'click': m.showOptions.bind(m)
} }
}), }),
$(new MA.IMDB(m)), $(new MA.IMDB(m)),
$(new MA.Trailer(m, { $(new MA.Trailer(m, {
'height': 150 'height': 150
})), })),
new Element('a.delete.icon2', { new Element('a.delete.icon2', {
'title': 'Don\'t suggest this movie again', 'title': 'Don\'t suggest this movie again',
'data-ignore': movie.imdb 'data-ignore': movie.imdb
}), }),
new Element('a.eye-open.icon2', { new Element('a.eye-open.icon2', {
'title': 'Seen it, like it, don\'t add', 'title': 'Seen it, like it, don\'t add',
'data-seen': movie.imdb 'data-seen': movie.imdb
}) })
)
);
m.data_container.removeEvents('click');
// Add rating
m.info_container.adopt(
m.rating = m.info.rating && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', {
'text': parseFloat(m.info.rating.imdb[0]),
'title': parseInt(m.info.rating.imdb[1]) + ' votes'
}) : null,
m.genre = m.info.genres && m.info.genres.length > 0 ? new Element('span.genres', {
'text': m.info.genres.slice(0, 3).join(', ')
}) : null
) )
);
m.data_container.removeEvents('click');
// Add rating $(m).inject(self.el);
m.info_container.adopt(
m.rating = m.info.rating && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', {
'text': parseFloat(m.info.rating.imdb[0]),
'title': parseInt(m.info.rating.imdb[1]) + ' votes'
}) : null,
m.genre = m.info.genres && m.info.genres.length > 0 ? new Element('span.genres', {
'text': m.info.genres.slice(0, 3).join(', ')
}) : null
)
$(m).inject(self.el); });
}); }
self.fireEvent('loaded'); self.fireEvent('loaded');