github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save state of history media type toggle

Browse source
This commit is contained in:
JonnyWong16 2018-10-13 22:12:08 -07:00
parent ec7afcdbc4
commit 6e4fa3ef63
3 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
data/interfaces/default/history.html
View file

@ -32,17 +32,17 @@
</div> </div>
% endif % endif
<div class="btn-group" data-toggle="buttons" id="media_type-selection"> <div class="btn-group" data-toggle="buttons" id="media_type-selection">
<label class="btn btn-dark active"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-all" value="" autocomplete="off"> All <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies <input type="radio" name="media_type-filter" id="history-movie" value="movie" autocomplete="off"> Movies
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows <input type="radio" name="media_type-filter" id="history-episode" value="episode" autocomplete="off"> TV Shows
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music <input type="radio" name="media_type-filter" id="history-track" value="track" autocomplete="off"> Music
</label> </label>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -154,6 +154,7 @@
selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection'); selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
$(selected_filter).closest('label').addClass('active'); $(selected_filter).closest('label').addClass('active');
media_type = $(selected_filter).val(); media_type = $(selected_filter).val();
setLocalStorage('history_media_type', media_type);
history_table.draw(); history_table.draw();
}); });
@ -163,8 +164,12 @@
}); });
} }
var media_type = null; var media_type = getLocalStorage('history_media_type', 'all');
var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"; var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
$('#history-' + media_type).prop('checked', true);
$('#history-' + media_type).closest('label').addClass('active');
loadHistoryTable(media_type, selected_user_id); loadHistoryTable(media_type, selected_user_id);
% if _session['user_group'] == 'admin': % if _session['user_group'] == 'admin':

15
data/interfaces/default/user.html
View file

@ -156,17 +156,17 @@ DOCUMENTATION :: END
</div> </div>
% endif % endif
<div class="btn-group" data-toggle="buttons" id="media_type-selection"> <div class="btn-group" data-toggle="buttons" id="media_type-selection">
<label class="btn btn-dark active"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-all" value="" autocomplete="off"> All <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies <input type="radio" name="media_type-filter" id="history-movie" value="movie" autocomplete="off"> Movies
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows <input type="radio" name="media_type-filter" id="history-episode" value="episode" autocomplete="off"> TV Shows
</label> </label>
<label class="btn btn-dark"> <label class="btn btn-dark">
<input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music <input type="radio" name="media_type-filter" id="history-track" value="track" autocomplete="off"> Music
</label> </label>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -435,6 +435,7 @@ DOCUMENTATION :: END
selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection'); selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
$(selected_filter).closest('label').addClass('active'); $(selected_filter).closest('label').addClass('active');
media_type = $(selected_filter).val(); media_type = $(selected_filter).val();
setLocalStorage('user_' + user_id + '-history_media_type', media_type);
history_table.draw(); history_table.draw();
}); });
} }
@ -494,7 +495,9 @@ DOCUMENTATION :: END
$('a[href="#tabs-history"]').on('shown.bs.tab', function() { $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
if (typeof(history_table) === 'undefined') { if (typeof(history_table) === 'undefined') {
var media_type = null; var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
$('#history-' + media_type).prop('checked', true);
$('#history-' + media_type).closest('label').addClass('active');
loadHistoryTable(media_type); loadHistoryTable(media_type);
} }
}); });

2
plexpy/webserve.py
View file

@ -1696,7 +1696,7 @@ class WebInterface(object):
custom_where.append(['session_history_metadata.section_id', section_id]) custom_where.append(['session_history_metadata.section_id', section_id])
if 'media_type' in kwargs: if 'media_type' in kwargs:
media_type = kwargs.get('media_type', "") media_type = kwargs.get('media_type', "")
if media_type: if media_type != 'all':
custom_where.append(['session_history.media_type', media_type]) custom_where.append(['session_history.media_type', media_type])
if 'transcode_decision' in kwargs: if 'transcode_decision' in kwargs:
transcode_decision = kwargs.get('transcode_decision', "") transcode_decision = kwargs.get('transcode_decision', "")