Filter History and Graphs in the WebUI

* Still need to prevent manually accessing endpoints with other user_ids

data/interfaces/default/base.html

@@ -210,9 +210,10 @@ from plexpy.helpers import anon_url
                     % else:
                     <li class="dropdown">
                     % endif
-                        <a href="#" class="dropdown-toggle" aria-haspopup="true" data-toggle="dropdown" data-hover="dropdown" data-href="settings"><i class="fa fa-lg fa-cogs"></i> <span class="caret"></span></a>
+                        <% href = 'settings' if _session['user_group'] == 'admin' else '#' %>
+                        <a href="#" class="dropdown-toggle" aria-haspopup="true" data-toggle="dropdown" data-hover="dropdown" data-href="${href}"><i class="fa fa-lg fa-cogs"></i> <span class="caret"></span></a>
                         <ul class="dropdown-menu" id="settings-dropdown-menu">
-                            % if user_group == 'admin':
+                            % if _session['user_group'] == 'admin':
                             <li><a href="settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
                             <li role="separator" class="divider"></li>
                             <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
@@ -229,7 +230,7 @@ from plexpy.helpers import anon_url
                             <li><a href="${http_root}auth/login"><i class="fa fa-fw fa-lock"></i> Admin Login</a></li>
                             <li role="separator" class="divider"></li>
                             % endif
-                            % if expiry:
+                            % if _session['expiry']:
                             <li><a href="${http_root}auth/logout"><i class="fa fa-fw fa-sign-out"></i> Logout</a></li>
                             % endif
                         </ul>

data/interfaces/default/graphs.html

@@ -12,6 +12,7 @@
             <span><i class="fa fa-bar-chart"></i> Graphs</span>
         </div>
         <div class="button-bar hidden-xs">
+            % if _session['user_group'] == 'admin':
             <div class="btn-group" id="user-selection">
                 <label>
                     <select name="graph-user" id="graph-user" class="btn" style="color: inherit;">
@@ -20,6 +21,7 @@
                     </select>
                 </label>
             </div>
+            % endif
             <div class="btn-group" data-toggle="buttons" id="yaxis-selection">
                 % if config['graph_type'] == 'duration':
                 <label class="btn btn-dark">
@@ -256,6 +258,8 @@
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 
 <script>
+    var selected_user_id = "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+
     // Modal popup dialog
     function selectHandler(selectedDate, selectedSeries) {
 
@@ -282,6 +286,7 @@
                 url: "history_table_modal",
                 type: 'post',
                 data:  {
+                    user_id: selected_user_id,
                     start_date: dateString,
                     media_type: media_type,
                     transcode_decision: transcode_decision
@@ -289,10 +294,6 @@
                 complete: function(xhr, status) {
                     $('#history-modal').modal('show');
                     $("#history-modal").html(xhr.responseText);
-                    var opt = $('#graph-user :selected');
-                    if (opt.prev().length) {
-                        $('#history_table_modal_filter input[type=search]').val(opt.text()).trigger("input");
-                    }
                 }
             });
         }
@@ -320,7 +321,6 @@
         var yaxis = "${config['graph_type']}";
         var current_range = ${config['graph_days']};
         var current_tab = "${'#' + config['graph_tab']}";
-        var selected_user_id = undefined;
         
         $('.days').html(current_range);
         
@@ -589,7 +589,7 @@
 
         // User changed
         $('#graph-user').on('change', function() {
-            selected_user_id = $(this).val() || undefined;
+            selected_user_id = $(this).val() || null;
             if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
             if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
             if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); }

data/interfaces/default/history.html

@@ -15,10 +15,12 @@
         </div>
         <div class="button-bar">
             <div class="colvis-button-bar hidden-xs"></div>
+            % if _session['user_group'] == 'admin':
             <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                 <i class="fa fa-trash-o"></i> Delete mode
             </button>
             <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
+            % endif
         </div>
     </div>
     <div class='table-card-back'>
@@ -84,7 +86,8 @@
                 data: function (d) {
                     return {
                         json_data: JSON.stringify(d),
-                        media_type: media_type
+                        media_type: media_type,
+                        user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
                     };
                 }
             }

data/interfaces/default/history_table_modal.html

@@ -40,6 +40,7 @@
                 return {
                     json_data: JSON.stringify(d),
                     grouping: false,
+                    user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
                     media_type: "${data.get('media_type')}",
                     transcode_decision: "${data.get('transcode_decision')}"