mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-31 03:50:11 -07:00
Rename template_name argument
This commit is contained in:
JonnyWong16
parent
d9b3b311b9
commit
7ff3abe8b7
2 changed files with 89 additions and 89 deletions
|
|
@ -318,7 +318,7 @@ def blacklist_logger():
|
|||
logger.blacklist_config(email_config)
|
||||
|
||||
|
||||
def serve_template(templatename, **kwargs):
|
||||
def serve_template(template_name, **kwargs):
|
||||
if plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR:
|
||||
logger.info("Tautulli Newsletters :: Using custom newsletter template directory.")
|
||||
template_dir = plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR
|
||||
|
|
@ -327,12 +327,12 @@ def serve_template(templatename, **kwargs):
|
|||
template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.NEWSLETTER_TEMPLATES)
|
||||
|
||||
if not plexpy.CONFIG.NEWSLETTER_INLINE_STYLES:
|
||||
templatename = templatename.replace('.html', '.internal.html')
|
||||
template_name = template_name.replace('.html', '.internal.html')
|
||||
|
||||
_hplookup = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h'])
|
||||
|
||||
try:
|
||||
template = _hplookup.get_template(templatename)
|
||||
template = _hplookup.get_template(template_name)
|
||||
return template.render(**kwargs), False
|
||||
except:
|
||||
return exceptions.html_error_template().render(), True
|
||||
|
|
@ -477,7 +477,7 @@ class Newsletter(object):
|
|||
logger.info("Tautulli Newsletters :: Generating newsletter%s." % (' preview' if self.is_preview else ''))
|
||||
|
||||
newsletter_rendered, self.template_error = serve_template(
|
||||
templatename=self._TEMPLATE,
|
||||
template_name=self._TEMPLATE,
|
||||
uuid=self.uuid,
|
||||
subject=self.subject_formatted,
|
||||
body=self.body_formatted,
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ class WebInterface(object):
|
|||
plexpy.initialize_scheduler()
|
||||
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "home")
|
||||
else:
|
||||
return serve_template(templatename="welcome.html", title="Welcome", config=config)
|
||||
return serve_template(template_name="welcome.html", title="Welcome", config=config)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -291,7 +291,7 @@ class WebInterface(object):
|
|||
"update_show_changelog": plexpy.CONFIG.UPDATE_SHOW_CHANGELOG,
|
||||
"first_run_complete": plexpy.CONFIG.FIRST_RUN_COMPLETE
|
||||
}
|
||||
return serve_template(templatename="index.html", title="Home", config=config)
|
||||
return serve_template(template_name="index.html", title="Home", config=config)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -336,10 +336,10 @@ class WebInterface(object):
|
|||
result = pms_connect.get_current_activity()
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="current_activity.html", data=result)
|
||||
return serve_template(template_name="current_activity.html", data=result)
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for get_current_activity.")
|
||||
return serve_template(templatename="current_activity.html", data=None)
|
||||
return serve_template(template_name="current_activity.html", data=None)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -350,9 +350,9 @@ class WebInterface(object):
|
|||
|
||||
if result:
|
||||
session = next((s for s in result['sessions'] if s['session_key'] == session_key), None)
|
||||
return serve_template(templatename="current_activity_instance.html", session=session)
|
||||
return serve_template(template_name="current_activity_instance.html", session=session)
|
||||
else:
|
||||
return serve_template(templatename="current_activity_instance.html", session=None)
|
||||
return serve_template(template_name="current_activity_instance.html", session=None)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -395,7 +395,7 @@ class WebInterface(object):
|
|||
endpoint = endpoint.format(machine_id=plexpy.CONFIG.PMS_IDENTIFIER)
|
||||
|
||||
url = base_url + endpoint + ('?' + urlencode(kwargs) if kwargs else '')
|
||||
return serve_template(templatename="xml_shortcut.html", title="Plex XML", url=url)
|
||||
return serve_template(template_name="xml_shortcut.html", title="Plex XML", url=url)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -405,7 +405,7 @@ class WebInterface(object):
|
|||
stats_type=stats_type,
|
||||
stats_count=stats_count)
|
||||
|
||||
return serve_template(templatename="home_stats.html", title="Stats", data=stats_data)
|
||||
return serve_template(template_name="home_stats.html", title="Stats", data=stats_data)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -416,7 +416,7 @@ class WebInterface(object):
|
|||
|
||||
stats_data = data_factory.get_library_stats(library_cards=library_cards)
|
||||
|
||||
return serve_template(templatename="library_stats.html", title="Library Stats", data=stats_data)
|
||||
return serve_template(template_name="library_stats.html", title="Library Stats", data=stats_data)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -426,13 +426,13 @@ class WebInterface(object):
|
|||
pms_connect = pmsconnect.PmsConnect()
|
||||
result = pms_connect.get_recently_added_details(count=count, media_type=media_type)
|
||||
except IOError as e:
|
||||
return serve_template(templatename="recently_added.html", data=None)
|
||||
return serve_template(template_name="recently_added.html", data=None)
|
||||
|
||||
if result and 'recently_added' in result:
|
||||
return serve_template(templatename="recently_added.html", data=result['recently_added'])
|
||||
return serve_template(template_name="recently_added.html", data=result['recently_added'])
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for get_recently_added.")
|
||||
return serve_template(templatename="recently_added.html", data=None)
|
||||
return serve_template(template_name="recently_added.html", data=None)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -467,7 +467,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def libraries(self, **kwargs):
|
||||
return serve_template(templatename="libraries.html", title="Libraries")
|
||||
return serve_template(template_name="libraries.html", title="Libraries")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -620,12 +620,12 @@ class WebInterface(object):
|
|||
library_details = library_data.get_details(section_id=section_id)
|
||||
except:
|
||||
logger.warn("Unable to retrieve library details for section_id %s " % section_id)
|
||||
return serve_template(templatename="library.html", title="Library", data=None, config=config)
|
||||
return serve_template(template_name="library.html", title="Library", data=None, config=config)
|
||||
else:
|
||||
logger.debug("Library page requested but no section_id received.")
|
||||
return serve_template(templatename="library.html", title="Library", data=None, config=config)
|
||||
return serve_template(template_name="library.html", title="Library", data=None, config=config)
|
||||
|
||||
return serve_template(templatename="library.html", title="Library", data=library_details, config=config)
|
||||
return serve_template(template_name="library.html", title="Library", data=library_details, config=config)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
|
|
@ -638,7 +638,7 @@ class WebInterface(object):
|
|||
result = None
|
||||
status_message = 'An error occured.'
|
||||
|
||||
return serve_template(templatename="edit_library.html", title="Edit Library",
|
||||
return serve_template(template_name="edit_library.html", title="Edit Library",
|
||||
data=result, server_id=plexpy.CONFIG.PMS_IDENTIFIER, status_message=status_message)
|
||||
|
||||
@cherrypy.expose
|
||||
|
|
@ -685,7 +685,7 @@ class WebInterface(object):
|
|||
@requireAuth()
|
||||
def library_watch_time_stats(self, section_id=None, **kwargs):
|
||||
if not allow_session_library(section_id):
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
|
||||
if section_id:
|
||||
library_data = libraries.Libraries()
|
||||
|
|
@ -694,16 +694,16 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for library_watch_time_stats.")
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def library_user_stats(self, section_id=None, **kwargs):
|
||||
if not allow_session_library(section_id):
|
||||
return serve_template(templatename="library_user_stats.html", data=None, title="Player Stats")
|
||||
return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
|
||||
|
||||
if section_id:
|
||||
library_data = libraries.Libraries()
|
||||
|
|
@ -712,16 +712,16 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="library_user_stats.html", data=result, title="Player Stats")
|
||||
return serve_template(template_name="library_user_stats.html", data=result, title="Player Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for library_user_stats.")
|
||||
return serve_template(templatename="library_user_stats.html", data=None, title="Player Stats")
|
||||
return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def library_recently_watched(self, section_id=None, limit='10', **kwargs):
|
||||
if not allow_session_library(section_id):
|
||||
return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
|
||||
if section_id:
|
||||
library_data = libraries.Libraries()
|
||||
|
|
@ -730,16 +730,16 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_recently_watched.html", data=result, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=result, title="Recently Watched")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for library_recently_watched.")
|
||||
return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def library_recently_added(self, section_id=None, limit='10', **kwargs):
|
||||
if not allow_session_library(section_id):
|
||||
return serve_template(templatename="library_recently_added.html", data=None, title="Recently Added")
|
||||
return serve_template(template_name="library_recently_added.html", data=None, title="Recently Added")
|
||||
|
||||
if section_id:
|
||||
pms_connect = pmsconnect.PmsConnect()
|
||||
|
|
@ -748,10 +748,10 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result and result['recently_added']:
|
||||
return serve_template(templatename="library_recently_added.html", data=result['recently_added'], title="Recently Added")
|
||||
return serve_template(template_name="library_recently_added.html", data=result['recently_added'], title="Recently Added")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for library_recently_added.")
|
||||
return serve_template(templatename="library_recently_added.html", data=None, title="Recently Added")
|
||||
return serve_template(template_name="library_recently_added.html", data=None, title="Recently Added")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -1243,7 +1243,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def users(self, **kwargs):
|
||||
return serve_template(templatename="users.html", title="Users")
|
||||
return serve_template(template_name="users.html", title="Users")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -1359,12 +1359,12 @@ class WebInterface(object):
|
|||
user_details = user_data.get_details(user_id=user_id)
|
||||
except:
|
||||
logger.warn("Unable to retrieve user details for user_id %s " % user_id)
|
||||
return serve_template(templatename="user.html", title="User", data=None)
|
||||
return serve_template(template_name="user.html", title="User", data=None)
|
||||
else:
|
||||
logger.debug("User page requested but no user_id received.")
|
||||
return serve_template(templatename="user.html", title="User", data=None)
|
||||
return serve_template(template_name="user.html", title="User", data=None)
|
||||
|
||||
return serve_template(templatename="user.html", title="User", data=user_details)
|
||||
return serve_template(template_name="user.html", title="User", data=user_details)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
|
|
@ -1377,7 +1377,7 @@ class WebInterface(object):
|
|||
result = None
|
||||
status_message = 'An error occured.'
|
||||
|
||||
return serve_template(templatename="edit_user.html", title="Edit User", data=result, status_message=status_message)
|
||||
return serve_template(template_name="edit_user.html", title="Edit User", data=result, status_message=status_message)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
|
|
@ -1425,7 +1425,7 @@ class WebInterface(object):
|
|||
@requireAuth()
|
||||
def user_watch_time_stats(self, user=None, user_id=None, **kwargs):
|
||||
if not allow_session_user(user_id):
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
|
||||
if user_id or user:
|
||||
user_data = users.Users()
|
||||
|
|
@ -1434,16 +1434,16 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for user_watch_time_stats.")
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def user_player_stats(self, user=None, user_id=None, **kwargs):
|
||||
if not allow_session_user(user_id):
|
||||
return serve_template(templatename="user_player_stats.html", data=None, title="Player Stats")
|
||||
return serve_template(template_name="user_player_stats.html", data=None, title="Player Stats")
|
||||
|
||||
if user_id or user:
|
||||
user_data = users.Users()
|
||||
|
|
@ -1452,16 +1452,16 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_player_stats.html", data=result, title="Player Stats")
|
||||
return serve_template(template_name="user_player_stats.html", data=result, title="Player Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for user_player_stats.")
|
||||
return serve_template(templatename="user_player_stats.html", data=None, title="Player Stats")
|
||||
return serve_template(template_name="user_player_stats.html", data=None, title="Player Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs):
|
||||
if not allow_session_user(user_id):
|
||||
return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
|
||||
if user_id or user:
|
||||
user_data = users.Users()
|
||||
|
|
@ -1470,10 +1470,10 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_recently_watched.html", data=result, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=result, title="Recently Watched")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for get_user_recently_watched.")
|
||||
return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -1879,7 +1879,7 @@ class WebInterface(object):
|
|||
"database_is_importing": database.IS_IMPORTING,
|
||||
}
|
||||
|
||||
return serve_template(templatename="history.html", title="History", config=config)
|
||||
return serve_template(template_name="history.html", title="History", config=config)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -2067,7 +2067,7 @@ class WebInterface(object):
|
|||
data_factory = datafactory.DataFactory()
|
||||
stream_data = data_factory.get_stream_details(row_id, session_key)
|
||||
|
||||
return serve_template(templatename="stream_data.html", title="Stream Data", data=stream_data, user=user)
|
||||
return serve_template(template_name="stream_data.html", title="Stream Data", data=stream_data, user=user)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -2158,7 +2158,7 @@ class WebInterface(object):
|
|||
|
||||
public = helpers.is_public_ip(ip_address)
|
||||
|
||||
return serve_template(templatename="ip_address_modal.html", title="IP Address Details",
|
||||
return serve_template(template_name="ip_address_modal.html", title="IP Address Details",
|
||||
data=ip_address, public=public, kwargs=kwargs)
|
||||
|
||||
@cherrypy.expose
|
||||
|
|
@ -2197,7 +2197,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def graphs(self, **kwargs):
|
||||
return serve_template(templatename="graphs.html", title="Graphs")
|
||||
return serve_template(template_name="graphs.html", title="Graphs")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -2711,9 +2711,9 @@ class WebInterface(object):
|
|||
@requireAuth()
|
||||
def history_table_modal(self, **kwargs):
|
||||
if kwargs.get('user_id') and not allow_session_user(kwargs['user_id']):
|
||||
return serve_template(templatename="history_table_modal.html", title="History Data", data=None)
|
||||
return serve_template(template_name="history_table_modal.html", title="History Data", data=None)
|
||||
|
||||
return serve_template(templatename="history_table_modal.html", title="History Data", data=kwargs)
|
||||
return serve_template(template_name="history_table_modal.html", title="History Data", data=kwargs)
|
||||
|
||||
|
||||
##### Sync #####
|
||||
|
|
@ -2721,7 +2721,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def sync(self, **kwargs):
|
||||
return serve_template(templatename="sync.html", title="Synced Items")
|
||||
return serve_template(template_name="sync.html", title="Synced Items")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -2780,7 +2780,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def logs(self, **kwargs):
|
||||
plex_log_files = log_reader.list_plex_logs()
|
||||
return serve_template(templatename="logs.html", title="Log", plex_log_files=plex_log_files)
|
||||
return serve_template(template_name="logs.html", title="Log", plex_log_files=plex_log_files)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
|
|
@ -3174,7 +3174,7 @@ class WebInterface(object):
|
|||
for key in ('home_sections', 'home_stats_cards', 'home_library_cards'):
|
||||
settings_dict[key] = json.dumps(settings_dict[key])
|
||||
|
||||
return serve_template(templatename="settings.html", title="Settings", config=settings_dict)
|
||||
return serve_template(template_name="settings.html", title="Settings", config=settings_dict)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3365,17 +3365,17 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_configuration_table(self, **kwargs):
|
||||
return serve_template(templatename="configuration_table.html")
|
||||
return serve_template(template_name="configuration_table.html")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_scheduler_table(self, **kwargs):
|
||||
return serve_template(templatename="scheduler_table.html")
|
||||
return serve_template(template_name="scheduler_table.html")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_queue_modal(self, queue=None, **kwargs):
|
||||
return serve_template(templatename="queue_modal.html", queue=queue)
|
||||
return serve_template(template_name="queue_modal.html", queue=queue)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3439,7 +3439,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def get_notifiers_table(self, **kwargs):
|
||||
result = notifiers.get_notifiers()
|
||||
return serve_template(templatename="notifiers_table.html", notifiers_list=result)
|
||||
return serve_template(template_name="notifiers_table.html", notifiers_list=result)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3522,7 +3522,7 @@ class WebInterface(object):
|
|||
for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']
|
||||
]
|
||||
|
||||
return serve_template(templatename="notifier_config.html", notifier=result, parameters=parameters)
|
||||
return serve_template(template_name="notifier_config.html", notifier=result, parameters=parameters)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3605,7 +3605,7 @@ class WebInterface(object):
|
|||
|
||||
text.append({'media_type': media_type, 'subject': test_subject, 'body': test_body})
|
||||
|
||||
return serve_template(templatename="notifier_text_preview.html", text=text, agent=agent_name)
|
||||
return serve_template(template_name="notifier_text_preview.html", text=text, agent=agent_name)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3783,7 +3783,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def get_mobile_devices_table(self, **kwargs):
|
||||
result = mobile_app.get_mobile_devices()
|
||||
return serve_template(templatename="mobile_devices_table.html", devices_list=result)
|
||||
return serve_template(template_name="mobile_devices_table.html", devices_list=result)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -3806,7 +3806,7 @@ class WebInterface(object):
|
|||
def get_mobile_device_config_modal(self, mobile_device_id=None, **kwargs):
|
||||
result = mobile_app.get_mobile_device_config(mobile_device_id=mobile_device_id)
|
||||
|
||||
return serve_template(templatename="mobile_device_config.html", device=result)
|
||||
return serve_template(template_name="mobile_device_config.html", device=result)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -4016,11 +4016,11 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def import_database_tool(self, app=None, **kwargs):
|
||||
if app == 'tautulli':
|
||||
return serve_template(templatename="app_import.html", title="Import Tautulli Database", app="Tautulli")
|
||||
return serve_template(template_name="app_import.html", title="Import Tautulli Database", app="Tautulli")
|
||||
elif app == 'plexwatch':
|
||||
return serve_template(templatename="app_import.html", title="Import PlexWatch Database", app="PlexWatch")
|
||||
return serve_template(template_name="app_import.html", title="Import PlexWatch Database", app="PlexWatch")
|
||||
elif app == 'plexivity':
|
||||
return serve_template(templatename="app_import.html", title="Import Plexivity Database", app="Plexivity")
|
||||
return serve_template(template_name="app_import.html", title="Import Plexivity Database", app="Plexivity")
|
||||
|
||||
logger.warn("No app specified for import.")
|
||||
return
|
||||
|
|
@ -4028,7 +4028,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
def import_config_tool(self, **kwargs):
|
||||
return serve_template(templatename="config_import.html", title="Import Tautulli Configuration")
|
||||
return serve_template(template_name="config_import.html", title="Import Tautulli Configuration")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -4301,7 +4301,7 @@ class WebInterface(object):
|
|||
else:
|
||||
new_http_root = '/'
|
||||
|
||||
return serve_template(templatename="shutdown.html", signal=signal, title=title,
|
||||
return serve_template(template_name="shutdown.html", signal=signal, title=title,
|
||||
new_http_root=new_http_root, message=message, timer=timer, quote=quote)
|
||||
|
||||
@cherrypy.expose
|
||||
|
|
@ -4411,7 +4411,7 @@ class WebInterface(object):
|
|||
if metadata['section_id'] and not allow_session_library(metadata['section_id']):
|
||||
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
|
||||
|
||||
return serve_template(templatename="info.html", metadata=metadata, title="Info",
|
||||
return serve_template(template_name="info.html", metadata=metadata, title="Info",
|
||||
config=config, source=source, user_info=user_info)
|
||||
else:
|
||||
if get_session_user_id():
|
||||
|
|
@ -4427,11 +4427,11 @@ class WebInterface(object):
|
|||
result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="info_children_list.html", data=result,
|
||||
return serve_template(template_name="info_children_list.html", data=result,
|
||||
media_type=media_type, title="Children List")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for get_item_children.")
|
||||
return serve_template(templatename="info_children_list.html", data=None, title="Children List")
|
||||
return serve_template(template_name="info_children_list.html", data=None, title="Children List")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -4441,9 +4441,9 @@ class WebInterface(object):
|
|||
result = pms_connect.get_item_children_related(rating_key=rating_key)
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="info_collection_list.html", data=result, title=title)
|
||||
return serve_template(template_name="info_collection_list.html", data=result, title=title)
|
||||
else:
|
||||
return serve_template(templatename="info_collection_list.html", data=None, title=title)
|
||||
return serve_template(template_name="info_collection_list.html", data=None, title=title)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -4455,10 +4455,10 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for item_watch_time_stats.")
|
||||
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
|
|
@ -4470,10 +4470,10 @@ class WebInterface(object):
|
|||
result = None
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="library_user_stats.html", data=result, title="Player Stats")
|
||||
return serve_template(template_name="library_user_stats.html", data=result, title="Player Stats")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for item_user_stats.")
|
||||
return serve_template(templatename="library_user_stats.html", data=None, title="Player Stats")
|
||||
return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -5095,7 +5095,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth()
|
||||
def search(self, query='', **kwargs):
|
||||
return serve_template(templatename="search.html", title="Search", query=query)
|
||||
return serve_template(template_name="search.html", title="Search", query=query)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -5152,10 +5152,10 @@ class WebInterface(object):
|
|||
if season['media_index'] == season_index]
|
||||
|
||||
if result:
|
||||
return serve_template(templatename="info_search_results_list.html", data=result, title="Search Result List")
|
||||
return serve_template(template_name="info_search_results_list.html", data=result, title="Search Result List")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for get_search_results_children.")
|
||||
return serve_template(templatename="info_search_results_list.html", data=None, title="Search Result List")
|
||||
return serve_template(template_name="info_search_results_list.html", data=None, title="Search Result List")
|
||||
|
||||
|
||||
##### Update Metadata #####
|
||||
|
|
@ -5172,10 +5172,10 @@ class WebInterface(object):
|
|||
query['query_string'] = query_string
|
||||
|
||||
if query:
|
||||
return serve_template(templatename="update_metadata.html", query=query, update=update, title="Info")
|
||||
return serve_template(template_name="update_metadata.html", query=query, update=update, title="Info")
|
||||
else:
|
||||
logger.warn("Unable to retrieve data for update_metadata.")
|
||||
return serve_template(templatename="update_metadata.html", query=query, update=update, title="Info")
|
||||
return serve_template(template_name="update_metadata.html", query=query, update=update, title="Info")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -6578,7 +6578,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def get_newsletters_table(self, **kwargs):
|
||||
result = newsletters.get_newsletters()
|
||||
return serve_template(templatename="newsletters_table.html", newsletters_list=result)
|
||||
return serve_template(template_name="newsletters_table.html", newsletters_list=result)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -6653,7 +6653,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def get_newsletter_config_modal(self, newsletter_id=None, **kwargs):
|
||||
result = newsletters.get_newsletter_config(newsletter_id=newsletter_id, mask_passwords=True)
|
||||
return serve_template(templatename="newsletter_config.html", newsletter=result)
|
||||
return serve_template(template_name="newsletter_config.html", newsletter=result)
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -6761,7 +6761,7 @@ class WebInterface(object):
|
|||
elif kwargs.pop('key', None) == plexpy.CONFIG.NEWSLETTER_PASSWORD:
|
||||
return self.newsletter_auth(*args, **kwargs)
|
||||
else:
|
||||
return serve_template(templatename="newsletter_auth.html",
|
||||
return serve_template(template_name="newsletter_auth.html",
|
||||
title="Newsletter Login",
|
||||
uri=request_uri)
|
||||
|
||||
|
|
@ -6798,7 +6798,7 @@ class WebInterface(object):
|
|||
@requireAuth(member_of("admin"))
|
||||
def newsletter_preview(self, **kwargs):
|
||||
kwargs['preview'] = 'true'
|
||||
return serve_template(templatename="newsletter_preview.html",
|
||||
return serve_template(template_name="newsletter_preview.html",
|
||||
title="Newsletter",
|
||||
kwargs=kwargs)
|
||||
|
||||
|
|
@ -6837,7 +6837,7 @@ class WebInterface(object):
|
|||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
def support(self, **kwargs):
|
||||
return serve_template(templatename="support.html", title="Support")
|
||||
return serve_template(template_name="support.html", title="Support")
|
||||
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
|
|
@ -6992,7 +6992,7 @@ class WebInterface(object):
|
|||
if media_type == 'photo_album':
|
||||
media_type = 'photoalbum'
|
||||
|
||||
return serve_template(templatename="export_modal.html", title="Export Metadata",
|
||||
return serve_template(template_name="export_modal.html", title="Export Metadata",
|
||||
section_id=section_id, user_id=user_id, rating_key=rating_key,
|
||||
media_type=media_type, sub_media_type=sub_media_type,
|
||||
export_type=export_type, file_formats=file_formats)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue