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

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
Ruud committed 2013-03-19 20:28:46 +01:00
2 parents a8369b4e93 e54928720a
commit b9c2b42725
3 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/plugins/movie/static/list.js
+2 -2
View File
@@ -429,12 +429,12 @@ var MovieList = new Class({
.addClass(new_view+'_list') .addClass(new_view+'_list')
self.current_view = new_view; self.current_view = new_view;
Cookie.write(self.options.identifier+'_view', new_view, {duration: 1000}); Cookie.write(self.options.identifier+'_view2', new_view, {duration: 1000});
}, },
getSavedView: function(){ getSavedView: function(){
var self = this; var self = this;
return Cookie.read(self.options.identifier+'_view'); return Cookie.read(self.options.identifier+'_view2');
}, },
search: function(){ search: function(){
couchpotato/core/plugins/searcher/main.py
+1 -1
View File
@@ -165,7 +165,7 @@ class Searcher(Plugin):
# See if better quality is available # See if better quality is available
for release in movie['releases']: for release in movie['releases']:
if release['quality']['order'] < quality_type['quality']['order'] and release['status_id'] not in [available_status.get('id'), ignored_status.get('id')]: if release['quality']['order'] <= quality_type['quality']['order'] and release['status_id'] not in [available_status.get('id'), ignored_status.get('id')]:
has_better_quality += 1 has_better_quality += 1
# Don't search for quality lower then already available. # Don't search for quality lower then already available.
couchpotato/static/scripts/page/home.js
+1 -1
View File
@@ -37,7 +37,7 @@ Page.Home = new Class({
'identifier': 'soon', 'identifier': 'soon',
'limit': 18, 'limit': 18,
'title': 'Available soon', 'title': 'Available soon',
'description': 'These are being searches for and should be available soon as they will be released on DVD in the next few weeks.', 'description': 'These are being searched for and should be available soon as they will be released on DVD in the next few weeks.',
'on_empty_element': new Element('div').adopt( 'on_empty_element': new Element('div').adopt(
new Element('h1', {'text': 'Available soon'}), new Element('h1', {'text': 'Available soon'}),
new Element('span', {'text': 'There are no movies available soon. Add some movies, so you have something to watch later.'}) new Element('span', {'text': 'There are no movies available soon. Add some movies, so you have something to watch later.'})