From 6b1a57e650b46308e05a482c7cbb350277b150fd Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 16 Aug 2015 22:52:08 +0200 Subject: [PATCH] Add "delete mode" on history table allows individual rows to be deleted permanently. Add user history purge option in edit user screen. Will remove all history for selected user. --- data/interfaces/default/edit_user.html | 21 +++++++ data/interfaces/default/history.html | 20 ++++++- data/interfaces/default/info.html | 4 +- .../default/js/tables/history_table.js | 60 +++++++++++++++---- data/interfaces/default/sync.html | 2 +- data/interfaces/default/user.html | 4 +- plexpy/datafactory.py | 46 +++++++++++++- plexpy/webserve.py | 29 +++++++++ 8 files changed, 165 insertions(+), 21 deletions(-) diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html index 37aba8bb..0a266196 100644 --- a/data/interfaces/default/edit_user.html +++ b/data/interfaces/default/edit_user.html @@ -58,6 +58,12 @@ DOCUMENTATION :: END

Uncheck this if you do not want this keep any history on this user's activity.

+ % if data['user_id']: +
+ +

DANGER ZONE! Click the purge button to remote all history logged for this user. This is permanent!

+
+ % endif
@@ -112,6 +118,21 @@ DOCUMENTATION :: END }); % endif }); + + $("#delete-all-history").click(function() { + var r = confirm("Are you REALLY REALLY REALLY sure you want to delete all history for this user?"); + if (r == true) { + $.ajax({ + url: 'delete_all_user_history', + data: {user_id: '${data['user_id']}'}, + cache: false, + async: true, + success: function(data) { + location.reload(); + } + }); + } + }); % endif \ No newline at end of file diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 26fbbc2c..2fdf5238 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -13,13 +13,16 @@
History
-
+ @@ -60,8 +63,21 @@ } } history_table = $('#history_table').DataTable(history_table_options); - var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' }); + var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' }); $(colvis.button()).appendTo('div.colvis-button-bar'); + + $('#row-edit-mode').click(function() { + if ($(this).hasClass('active')) { + $('.delete-control').each(function() { + $(this).addClass('hidden'); + }); + } else { + $('.delete-control').each(function() { + $(this).removeClass('hidden'); + }); + } + }); + }); diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 79798f3f..bb4d4ca0 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -256,7 +256,7 @@ DOCUMENTATION :: END history_table = $('#history_table').DataTable(history_table_options); history_table.column(4).visible(false); - var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' }); + var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' }); $(colvis.button()).appendTo('div.colvis-button-bar'); }); @@ -274,7 +274,7 @@ DOCUMENTATION :: END } } history_table = $('#history_table').DataTable(history_table_options); - var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' }); + var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' }); $(colvis.button()).appendTo('div.colvis-button-bar'); }); diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 51df2ab9..e2aacc8a 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -25,10 +25,11 @@ history_table_options = { "processing": false, "serverSide": true, "pageLength": 25, - "order": [ 0, 'desc'], + "order": [ 1, 'desc'], + "autoWidth": false, "columnDefs": [ { - "targets": [0], + "targets": [1], "data":"date", "createdCell": function (td, cellData, rowData, row, col) { if (rowData['stopped'] === null) { @@ -41,7 +42,7 @@ history_table_options = { "className": "no-wrap" }, { - "targets": [1], + "targets": [2], "data":"friendly_name", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { @@ -57,7 +58,7 @@ history_table_options = { "className": "no-wrap hidden-xs" }, { - "targets": [2], + "targets": [3], "data":"player", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { @@ -67,7 +68,7 @@ history_table_options = { "className": "modal-control no-wrap hidden-sm hidden-xs" }, { - "targets": [3], + "targets": [4], "data":"ip_address", "createdCell": function (td, cellData, rowData, row, col) { if (cellData) { @@ -87,7 +88,7 @@ history_table_options = { "className": "no-wrap hidden-xs modal-control-ip" }, { - "targets": [4], + "targets": [5], "data":"full_title", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { @@ -106,7 +107,7 @@ history_table_options = { } }, { - "targets": [5], + "targets": [6], "data":"started", "createdCell": function (td, cellData, rowData, row, col) { if (cellData === null) { @@ -119,7 +120,7 @@ history_table_options = { "className": "no-wrap hidden-sm hidden-xs" }, { - "targets": [6], + "targets": [7], "data":"paused_counter", "render": function ( data, type, full ) { if (data !== null) { @@ -132,7 +133,7 @@ history_table_options = { "className": "no-wrap hidden-xs" }, { - "targets": [7], + "targets": [8], "data":"stopped", "createdCell": function (td, cellData, rowData, row, col) { if (cellData === null) { @@ -145,7 +146,7 @@ history_table_options = { "className": "no-wrap hidden-md hidden-xs" }, { - "targets": [8], + "targets": [9], "data":"duration", "render": function ( data, type, full ) { if (data !== null) { @@ -158,7 +159,7 @@ history_table_options = { "className": "no-wrap hidden-xs" }, { - "targets": [9], + "targets": [10], "data":"percent_complete", "render": function ( data, type, full ) { if (data > 80) { @@ -173,7 +174,17 @@ history_table_options = { "orderable": false, "className": "no-wrap hidden-md hidden-xs", "width": "10px" - } + }, + { + "targets": [0], + "data": null, + "createdCell": function (td, cellData, rowData, row, col) { + $(td).html(''); + }, + "className": "delete-control no-wrap hidden", + "searchable": false, + "orderable": false + }, ], "drawCallback": function (settings) { // Jump to top of page @@ -183,6 +194,11 @@ history_table_options = { $('.info-modal').each(function() { $(this).tooltip(); }); + if ($('#row-edit-mode').hasClass('active')) { + $('.delete-control').each(function() { + $(this).removeClass('hidden'); + }); + } }, "preDrawCallback": function(settings) { var msg = "
 Fetching rows...
"; @@ -228,6 +244,24 @@ $('#history_table').on('click', 'td.modal-control-ip', function () { }); } } - getUserLocation(rowData['ip_address']); +}); + +$('#history_table').on('click', 'td.delete-control', function () { + var tr = $(this).parents('tr'); + var row = history_table.row( tr ); + var rowData = row.data(); + + $(this).children("button").prop('disabled', true); + $(this).children("button").html(' Delete'); + + $.ajax({ + url: 'delete_history_rows', + data: {row_id: rowData['id']}, + async: true, + success: function(data) { + history_table.ajax.reload(); + } + }); + }); \ No newline at end of file diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html index 80817af5..343f8f9f 100644 --- a/data/interfaces/default/sync.html +++ b/data/interfaces/default/sync.html @@ -58,7 +58,7 @@ } sync_table = $('#sync_table').DataTable(sync_table_options); - var colvis = new $.fn.dataTable.ColVis( sync_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' } ); + var colvis = new $.fn.dataTable.ColVis( sync_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' } ); $( colvis.button() ).appendTo('div.colvis-button-bar'); }); diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index ba48c9ec..2f238218 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -291,7 +291,7 @@ from plexpy import helpers history_table = $('#history_table').DataTable(history_table_options); history_table.column(1).visible(false); - var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' }); + var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' }); $(colvis.button()).appendTo('#button-bar-history'); }); @@ -322,7 +322,7 @@ from plexpy import helpers sync_table = $('#sync_table').DataTable(sync_table_options); history_table.column(1).visible(false); - var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: 'Select columns', buttonClass: 'btn btn-dark' } ); + var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: ' Select columns', buttonClass: 'btn btn-dark' } ); $( colvis_sync.button() ).appendTo('#button-bar-sync'); }); diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 13ab1b54..97a58c24 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -474,4 +474,48 @@ class DataFactory(object): 'actors': actors } - return metadata \ No newline at end of file + return metadata + + def delete_session_history_rows(self, row_id=None): + monitor_db = database.MonitorDatabase() + + if row_id.isdigit(): + logger.info(u"PlexPy DataFactory :: Deleting row id %s from the session history database." % row_id) + session_history_del = \ + monitor_db.action('DELETE FROM session_history WHERE id = ?', [row_id]) + session_history_media_info_del = \ + monitor_db.action('DELETE FROM session_history_media_info WHERE id = ?', [row_id]) + session_history_metadata_del = \ + monitor_db.action('DELETE FROM session_history_metadata WHERE id = ?', [row_id]) + + return 'Deleted rows %s.' % row_id + else: + return 'Unable to delete rows. Input row not valid.' + + def delete_all_user_history(self, user_id=None): + monitor_db = database.MonitorDatabase() + + if user_id.isdigit(): + logger.info(u"PlexPy DataFactory :: Deleting all history for user id %s from database." % user_id) + session_history_media_info_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_media_info ' + 'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id ' + 'FROM session_history_media_info ' + 'JOIN session_history ON session_history_media_info.id = session_history.id ' + 'WHERE session_history.user_id = ?)', [user_id]) + session_history_metadata_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_metadata ' + 'WHERE session_history_metadata.id IN (SELECT session_history_metadata.id ' + 'FROM session_history_metadata ' + 'JOIN session_history ON session_history_metadata.id = session_history.id ' + 'WHERE session_history.user_id = ?)', [user_id]) + session_history_del = \ + monitor_db.action('DELETE FROM ' + 'session_history ' + 'WHERE session_history.user_id = ?', [user_id]) + + return 'Deleted all items for user_id %s.' % user_id + else: + return 'Unable to delete items. Input user_id not valid.' diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 79eb5db3..ef2ad933 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1256,3 +1256,32 @@ class WebInterface(object): return serve_template(templatename="notification_triggers_modal.html", title="Notification Triggers", data=this_agent) + + @cherrypy.expose + def delete_history_rows(self, row_id, **kwargs): + data_factory = datafactory.DataFactory() + + if row_id: + delete_row = data_factory.delete_session_history_rows(row_id=row_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def delete_all_user_history(self, user_id, **kwargs): + data_factory = datafactory.DataFactory() + + if user_id: + delete_row = data_factory.delete_all_user_history(user_id=user_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) +
Delete Time User Platform