From bd08921f17fee7cb49f17319f07ecfef1f7ed175 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 25 Apr 2019 23:06:37 -0700 Subject: [PATCH] Post to osTicket before the upload for review --- .bin/Scripts/functions/hw_diags.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index 0fc0724f..5f558803 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -1126,6 +1126,18 @@ def run_hw_tests(state): print_warning('Errors encountered posting results to osTicket.') print_standard(' ') + # Upload for review + if ENABLED_UPLOAD_DATA and ask('Upload results for review?'): + try_and_print( + message='Saving debug reports...', + function=save_debug_reports, + state=state, global_vars=global_vars) + try_and_print( + message='Uploading Data...', + function=upload_logdir, + global_vars=global_vars, + reason='Review') + # Done sleep(1) if state.quick_mode: @@ -1699,17 +1711,6 @@ def show_results(state): # Update progress update_progress_pane(state) - # Ask for review - if ENABLED_UPLOAD_DATA and ask('Upload results for review?'): - try_and_print( - message='Saving debug reports...', - function=save_debug_reports, - state=state, global_vars=global_vars) - try_and_print( - message='Uploading Data...', - function=upload_logdir, - global_vars=global_vars) - def update_main_options(state, selection, main_options): """Update menu and state based on selection."""