Merge pull request #23053 from mantidproject/23035_error_reporting_no…

…t_reporting Fix error reporter not reporting to database
mantidproject · Jul 24, 2018 · fac942f · fac942f
2 parents 6cf6f37 + b41d986
commit fac942f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/Framework/Kernel/src/ErrorReporter.cpp b/Framework/Kernel/src/ErrorReporter.cpp
@@ -102,6 +102,9 @@ std::string ErrorReporter::generateErrorMessage() {
   if (m_share) {
     message["email"] = m_email;
     message["name"] = m_name;
+  } else {
+    message["email"] = "";
+    message["name"] = "";
   }
 
   ::Json::FastWriter writer;

diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
@@ -668,6 +668,7 @@ qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/images.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/MantidWidgets.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images//fonts/fonts.qrc )
 qt4_add_resources ( RES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/icons.qrc )
+qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/scripts/ErrorReporter/errorreporter.qrc )
 
 ###########################################################################
 # Add the dependencies

diff --git a/MantidPlot/src/Mantid/MantidApplication.cpp b/MantidPlot/src/Mantid/MantidApplication.cpp
@@ -86,7 +86,8 @@ bool MantidApplication::notify(QObject *receiver, QEvent *event) {
                        "ErrorReporterPresenter"
                        "\nfrom ErrorReporter.errorreport import CrashReportPage"
                        "\npage = CrashReportPage(show_continue_terminate=True)"
-                       "\npresenter = ErrorReporterPresenter(page, '')");
+                       "\npresenter = ErrorReporterPresenter(page, '')"
+                       "\npresenter.show_view()");
 
     emit runAsPythonScript(pythonCode);
   } else if (error) {

diff --git a/scripts/ErrorReporter/error_dialog_app.py b/scripts/ErrorReporter/error_dialog_app.py
@@ -30,9 +30,11 @@ def main():
         return int(command_line_args.exit_code)
     app = QtGui.QApplication(sys.argv)
     form = CrashReportPage(show_continue_terminate=False)
-    ErrorReporterPresenter(form, command_line_args.exit_code)
+    presenter = ErrorReporterPresenter(form, command_line_args.exit_code)
+    presenter.show_view()
     app.exec_()
     return int(command_line_args.exit_code)
 
+
 if __name__ == '__main__':              # if we're running file directly and not importing it
     sys.exit(main())                              # run the main function
diff --git a/scripts/ErrorReporter/error_report_presenter.py b/scripts/ErrorReporter/error_report_presenter.py
@@ -2,28 +2,28 @@
 from mantid.kernel import Logger
 
 
-class ErrorReporterPresenter():
+class ErrorReporterPresenter(object):
     def __init__(self, view, exit_code):
+        self.error_log = Logger("error")
         self._view = view
         self._exit_code = exit_code
-        self._view.connect_signal(self.error_handler)
-        self._view.show()
-        self.error_log = Logger("error")
+        self._view.action.connect(self.error_handler)
 
     def error_handler(self, continue_working, share, name, email):
         if share == 0:
             errorReporter = ErrorReporter(
-                "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code,
-                True, str(name), str(email))
+                "mantidplot", UsageService.getUpTime(), self._exit_code, True, str(name), str(email))
             errorReporter.sendErrorReport()
         elif share == 1:
             errorReporter = ErrorReporter(
-                "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code,
-                False, str(name), str(email))
+                "mantidplot", UsageService.getUpTime(), self._exit_code, False, str(name), str(email))
             errorReporter.sendErrorReport()
 
         if not continue_working:
             self.error_log.error("Terminated by user.")
             self._view.quit()
         else:
             self.error_log.error("Continue working.")
+
+    def show_view(self):
+        self._view.show()
diff --git a/scripts/ErrorReporter/errorreport.py b/scripts/ErrorReporter/errorreport.py
@@ -39,9 +39,6 @@ def __init__(self, parent=None, show_continue_terminate=False):
     def quit (self):
         self.quit_signal.emit()
 
-    def connect_signal(self, slot):
-        self.action.connect(slot)
-
     def fullShare(self):
         self.action.emit(self.continue_working, 0, self.input_name, self.input_email)
         self.close()