Merge branch 'develop' into feature/variable-category-selector

QuantiModo · May 3, 2021 · 37a3741 · 37a3741 · mikepsinn · May 3, 2021
2 parents ed4db98 + 0dec311
commit 37a3741
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -176,7 +176,7 @@
     "simple-git": "1.126.0",
     "superagent": "6.1.0",
     "sw-precache": "5.2.1",
-    "sweetalert2": "10.16.0",
+    "sweetalert2": "10.16.7",
     "taco-team-build": "0.2.5",
     "time-require": "0.1.2",
     "ts-node": "8.5.4",

diff --git a/src/js/services/qmService.js b/src/js/services/qmService.js
@@ -307,8 +307,7 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
                 showErrorAlertMessageOrSendToLogin: function(title, errorMessage){
                     if(errorMessage){
                         if(typeof errorMessage !== "string"){
-                            qmLog.error('errorMessage is not a string and is type '+typeof errorMessage+": "+JSON.stringify(errorMessage));
-                            return;
+                            errorMessage = JSON.stringify(errorMessage);
                         }
                         if(errorMessage.toLowerCase().indexOf('unauthorized') !== -1){
                             qm.auth.setAfterLoginGoToUrlAndSendToLogin(title + ": " + errorMessage);