Fix user IPs table breaking if there are blank IPs.

Fix user_id showing on right of history table in info page.
Add Donations button to readme.
This commit is contained in:
Tim 2015-07-18 12:23:56 +02:00
parent cf55f239fb
commit a439cdb626
3 changed files with 14 additions and 5 deletions

View file

@ -8,6 +8,10 @@ A python based web application for monitoring and logging activity on your Plex
* plexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program * plexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program
If you'd like to buy me a beer, hit the donate button below.
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9HZK9BDJLKT6)
###Support ###Support
----------- -----------

View file

@ -189,6 +189,7 @@ from plexpy import helpers
<th class="never" align='left' id="user"></th> <th class="never" align='left' id="user"></th>
<th class="never" align='left' id="media_type"></th> <th class="never" align='left' id="media_type"></th>
<th class="never" align='left' id="video_decision"></th> <th class="never" align='left' id="video_decision"></th>
<th class="never" align='left' id="user_id"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View file

@ -35,14 +35,18 @@ user_ip_table_options = {
"width": "15%", "width": "15%",
"className": "modal-control no-wrap", "className": "modal-control no-wrap",
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
if (isPrivateIP(cellData)) { if (cellData) {
if (cellData != '') { if (isPrivateIP(cellData)) {
$(td).html(cellData); if (cellData != '') {
$(td).html(cellData);
} else {
$(td).html('n/a');
}
} else { } else {
$(td).html('n/a'); $(td).html('<a href="#ip-info-modal" data-toggle="modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="icon-map-marker icon-white"></i></span>&nbsp' + cellData +'</a>');
} }
} else { } else {
$(td).html('<a href="#ip-info-modal" data-toggle="modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="icon-map-marker icon-white"></i></span>&nbsp' + cellData +'</a>'); $(td).html('n/a');
} }
}, },
"width": "15%" "width": "15%"