Merge branch '4.8' of github.com:Ultimaker/Cura

cura/CuraApplication.py

@@ -1901,9 +1901,10 @@ class CuraApplication(QtApplication):
 
             if select_models_on_load:
                 Selection.add(node)
-
-        arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes)
-
+        try:
+            arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes)
+        except:
+            Logger.logException("e", "Failed to arrange the models")
         self.fileCompleted.emit(file_name)
 
     def addNonSliceableExtension(self, extension):

cura/OAuth2/AuthorizationHelpers.py

@@ -127,7 +127,7 @@ class AuthorizationHelpers:
             user_id = user_data["user_id"],
             username = user_data["username"],
             profile_image_url = user_data.get("profile_image_url", ""),
-            organization_id = user_data.get("organization", {}).get("organization_id", ""),
+            organization_id = user_data.get("organization", {}).get("organization_id"),
             subscriptions = user_data.get("subscriptions", [])
         )
 

plugins/SliceInfoPlugin/SliceInfo.py

@@ -125,7 +125,8 @@ class SliceInfo(QObject, Extension):
             data["schema_version"] = 0
             data["cura_version"] = self._application.getVersion()
             data["cura_build_type"] = ApplicationMetadata.CuraBuildType
-            data["organization_id"] = user_profile.get("organization_id", None) if user_profile else None
+            org_id = user_profile.get("organization_id", None) if user_profile else None
+            data["organization_id"] = org_id if org_id else None
             data["subscriptions"] = user_profile.get("subscriptions", []) if user_profile else []
 
             active_mode = self._application.getPreferences().getValue("cura/active_mode")