From df29c528003d0d4d8b81bf00cae9307fda66051d Mon Sep 17 00:00:00 2001 From: cigamit Date: Tue, 30 Aug 2016 22:03:56 -0500 Subject: [PATCH] use local storage and insure showing/hiding spacers works --- host.php | 18 +++++++++++++++++- include/layout.js | 10 +++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/host.php b/host.php index c2bb0239a..cfd46c701 100644 --- a/host.php +++ b/host.php @@ -297,7 +297,7 @@ function form_actions() { api_tree_item_save(0, get_nfilter_request_var('tree_id'), TREE_ITEM_TYPE_HOST, get_nfilter_request_var('tree_item_id'), '', 0, $selected_items[$i], 1, 1, false); } }elseif (get_request_var('drp_action') == 6) { /* automation */ - cacti_log(__FUNCTION__ . ' called, action: ' . $action, true, 'AUTOM8 TRACE', POLLER_VERBOSITY_MEDIUM); + cacti_log(__FUNCTION__ . ' called, action: ' . get_request_var('drp_action'), true, 'AUTOM8 TRACE', POLLER_VERBOSITY_MEDIUM); cacti_log(__FUNCTION__ . ', items: ' . get_nfilter_request_var('selected_items'), true, 'AUTOM8 TRACE', POLLER_VERBOSITY_MEDIUM); @@ -965,6 +965,10 @@ function device_javascript() { var ping_retries = $('#ping_retries').val(); function setPing() { + if ($('#row_host_avail_head').hasClass('collapsed')) { + return false; + } + availability_method = $('#availability_method').val(); ping_method = $('#ping_method').val(); @@ -1009,6 +1013,10 @@ function device_javascript() { } function setAvailability() { + if ($('#row_host_avail_head').hasClass('collapsed')) { + return false; + } + if ($('#snmp_version').val() == '0') { methods = [ { value: '0', text: 'None' }, @@ -1071,6 +1079,10 @@ function device_javascript() { } function setSNMP() { + if ($('#row_host_snmp_head').hasClass('collapsed')) { + return false; + } + snmp_version = $('#snmp_version').val(); switch(snmp_version) { case '0': // No SNMP @@ -1157,6 +1169,10 @@ function device_javascript() { $('#dqdebug').empty().fadeOut('fast'); }); + $('[id$="spacer"]').click(function() { + changeHostForm(); + }); + $.get(urlPath+'host.php?action=ping_host&id='+$('#id').val(), function(data) { $('#ping_results').html(data); }); diff --git a/include/layout.js b/include/layout.js index 08779bbf1..952547db6 100644 --- a/include/layout.js +++ b/include/layout.js @@ -591,25 +591,29 @@ function ajaxAnchors() { } function setupCollapsible() { - storage=$.sessionStorage; + storage=$.localStorage; $('.collapsible').each(function(data) { id=$(this).attr('id')+'_cs'; state = storage.get(id); if (state == 'hide') { + $(this).addClass('collapsed'); $(this).nextUntil('tr.spacer').hide(); $(this).find('i').removeClass('fa-angle-double-up').addClass('fa-angle-double-down'); + storage.set(id, 'hide'); } }); $('.collapsible').click(function(data) { id=$(this).attr('id')+'_cs'; if ($(this).find('i').hasClass('fa-angle-double-up')) { - $(this).nextUntil('tr.spacer').slideUp('fast'); + $(this).addClass('collapsed'); + $(this).nextUntil('tr.spacer').slideUp('slow'); $(this).find('i').removeClass('fa-angle-double-up').addClass('fa-angle-double-down'); storage.set(id, 'hide'); }else{ - $(this).nextUntil('tr.spacer').slideDown('fast'); + $(this).removeClass('collapsed'); + $(this).nextUntil('tr.spacer').slideDown('slow'); $(this).nextUntil('tr.spacer').each(function(data) { $(this).find('input, select').change(); });