diff --git a/data/interfaces/default/js/graphs/plays_by_month.js b/data/interfaces/default/js/graphs/plays_by_month.js index febe8bbe..d8cf6ebd 100644 --- a/data/interfaces/default/js/graphs/plays_by_month.js +++ b/data/interfaces/default/js/graphs/plays_by_month.js @@ -25,11 +25,7 @@ var hc_plays_by_month_options = { }, colors: ['#F9AA03', '#FFFFFF'], xAxis: { - type: 'datetime', labels: { - formatter: function() { - return moment(this.value).format("MMM YYYY"); - }, style: { color: '#aaa' } diff --git a/plexpy/graphs.py b/plexpy/graphs.py index d3590d36..8b139d82 100644 --- a/plexpy/graphs.py +++ b/plexpy/graphs.py @@ -259,7 +259,7 @@ class Graphs(object): dt = datetime.datetime(*month_item[:6]) date_string = dt.strftime('%Y-%m') - categories.append(date_string) + categories.append(dt.strftime('%b %Y')) series_1_value = 0 series_2_value = 0 for item in result: diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 8b7e3c6d..93092587 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -492,18 +492,34 @@ class WebInterface(object): kwargs[plain_config] = kwargs[use_config] del kwargs[use_config] + # Check if we should refresh our data + refresh_users = False + reschedule = False + + if 'monitoring_interval' in kwargs and 'refresh_users_interval' in kwargs: + if (kwargs['monitoring_interval'] != str(plexpy.CONFIG.MONITORING_INTERVAL)) or \ + (kwargs['refresh_users_interval'] != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL)): + reschedule = True + + if 'pms_ip' in kwargs: + if kwargs['pms_ip'] != plexpy.CONFIG.PMS_IP: + refresh_users = True + plexpy.CONFIG.process_kwargs(kwargs) # Write the config plexpy.CONFIG.write() - # Reconfigure scheduler - plexpy.initialize_scheduler() - + # Get new server URLs for SSL communications. plextv.get_real_pms_url() - # Refresh users table. Probably shouldn't do this on every config save, will improve this later. - threading.Thread(target=plextv.refresh_users).start() + # Reconfigure scheduler if intervals changed + if reschedule: + plexpy.initialize_scheduler() + + # Refresh users table if our server IP changes. + if refresh_users: + threading.Thread(target=plextv.refresh_users).start() raise cherrypy.HTTPRedirect("settings")