anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add "delete mode" on history table allows individual rows to be deleted permanently.

Browse Source 
Add user history purge option in edit user screen. Will remove all history for selected user.
This commit is contained in:
Tim
2015-08-16 22:52:08 +02:00
parent 8e57df53fd
commit 6b1a57e650
8 changed files with 165 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
data/interfaces/default/edit_user.html
View File

@@ -58,6 +58,12 @@ DOCUMENTATION :: END
</label>
<p class="help-block">Uncheck this if you do not want this keep any history on this user's activity.</p>
</div>
% if data['user_id']:
<div class="form-group">
<button class="btn btn-danger" id="delete-all-history">Purge</button>
<p class="help-block">DANGER ZONE! Click the purge button to remote all history logged for this user. This is permanent!</p>
</div>
% endif
</fieldset>
</div>
<div class="modal-footer">
@@ -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();
}
});
}
});
</script>
% endif

20
data/interfaces/default/history.html
View File

@@ -13,13 +13,16 @@
<div class="header-bar">
<span><i class="fa fa-history"></i> History</span>
</div>
<div class="colvis-button-bar hidden-xs">
<div class="button-bar">
<button class="btn btn-danger" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode"><i class="fa fa-trash-o"></i> Delete Mode</button>&nbsp
<div class="colvis-button-bar hidden-xs"></div>
</div>
</div>
<div class='table-card-back'>
<table class="display" id="history_table" width="100%">
<thead>
<tr>
<th align='left' id="delete_row">Delete</th>
<th align='left' id="time">Time</th>
<th align='left' id="friendly_name">User</th>
<th align='left' id="platform">Platform</th>
@@ -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: '<i class="fa fa-columns"> Select columns</i>', 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');
});
}
});
});
</script>

4
data/interfaces/default/info.html
View File

@@ -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: '<i class="fa fa-columns"> Select columns</i>', buttonClass: 'btn btn-dark' });
$(colvis.button()).appendTo('div.colvis-button-bar');
});
</script>
@@ -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: '<i class="fa fa-columns"> Select columns</i>', buttonClass: 'btn btn-dark' });
$(colvis.button()).appendTo('div.colvis-button-bar');
});
</script>

60
data/interfaces/default/js/tables/history_table.js
View File

@@ -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('<button class="btn btn-xs btn-danger" data-id="' + rowData['id'] + '"><i class="fa fa-trash-o"></i> Delete</button>');
},
"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 = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
@@ -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('<i class="fa fa-spin fa-refresh"></i> Delete');
$.ajax({
url: 'delete_history_rows',
data: {row_id: rowData['id']},
async: true,
success: function(data) {
history_table.ajax.reload();
}
});
});

2
data/interfaces/default/sync.html
View File

@@ -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: '<i class="fa fa-columns"> Select columns</i>', buttonClass: 'btn btn-dark' } );
$( colvis.button() ).appendTo('div.colvis-button-bar');
});
</script>

4
data/interfaces/default/user.html
View File

@@ -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: '<i class="fa fa-columns"> Select columns</i>', 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: '<i class="fa fa-columns"> Select columns</i>', buttonClass: 'btn btn-dark' } );
$( colvis_sync.button() ).appendTo('#button-bar-sync');
});