Merge remote-tracking branch 'origin/master'

This commit is contained in:
marco
2020-06-04 20:22:32 +02:00
2 changed files with 4 additions and 8 deletions

View File

@@ -1059,8 +1059,8 @@ def videolibrary(itemlist, item, typography='', function_level=1, function=''):
if not typography: typography = 'color kod bold'
title = typo(config.get_localized_string(30161), typography)
contentSerieName=item.contentSerieName if item.contentSerieName else ''
contentTitle=item.contentTitle if item.contentTitle else ''
contentSerieName=item.contentSerieName if item.contentSerieName else item.fulltitle if item.contentType != 'movie' else ''
contentTitle=item.contentTitle if item.contentTitle else item.fulltitle if item.contentType == 'movie' else ''
if (function == 'findvideos' and contentType == 'movie') \
or (function == 'episodios' and contentType != 'movie'):

View File

@@ -111,12 +111,8 @@ def show_menu(item):
if 'channel_name' in json and not 'disable_search' in json:
if 'search' in json and 'url' in json['search']:
search_json = json['search']
itemlist += get_search_menu(item, search_json, channel_name=json['channel_name'])
else:
itemlist += get_search_menu(item, json, channel_name=json['channel_name'])
if 'channel_name' in json and not 'disable_search' in json and 'search' not in json:
itemlist += get_search_menu(item, json, channel_name=json['channel_name'])
support.log('PAGINATION:', disable_pagination)
return itemlist