From 12ea0fdd53edb88097e244fc0c437c9f64161a74 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 24 Dec 2018 21:59:00 -0700 Subject: [PATCH] Posting disk results is working --- .bin/Scripts/functions/hw_diags.py | 2 -- .bin/Scripts/functions/osticket.py | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index b50744aa..eb4154a7 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -4,9 +4,7 @@ import json import re import time -# TODO: Still need functions.data ? from collections import OrderedDict -from functions.data import * from functions.png_graph import * from functions.osticket import * from functions.sensors import * diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index e7f2ee19..d82db04a 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -69,6 +69,9 @@ class osTicket(): if not source_report: index = 0 source_report = test.dev.generate_attribute_report() + elif not source_report: + index = 0 + out_report.append('{} ({})'.format(name, status)) else: out_report.append('{} ({})'.format(strip_colors(source_report[0]), status)) @@ -345,8 +348,8 @@ class osTicket(): # Build SQL cmd sql_cmd = "UPDATE `{Name}`.`{Ticket}`".format( **OSTICKET['Database'], **OSTICKET['Tables']) - sql_cmd += " SET `{}` = `{}`".format(flag_name, flag_value) - sql_cmd += " WHERE `{Ticket}`.`ticket_id` = `{ticket_id}`".format( + sql_cmd += " SET `{}` = '{}'".format(flag_name, flag_value) + sql_cmd += " WHERE `{Ticket}`.`ticket_id` = {ticket_id}".format( ticket_id=ticket_id, **OSTICKET['Tables']) sql_cmd += ";"