huqi 5 лет назад
Родитель
Сommit
78736d54bf

+ 1 - 1
o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -639,7 +639,7 @@ MWF.xDesktop.Actions.RestActions.Callback = new Class({
                 }
                 errorText = errorText.replace(/\</g, "&lt;");
                 errorText = errorText.replace(/\</g, "&gt;");
-                MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
+                if (layout.session && layout.session.user) MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
             }
 		//	throw "request error: "+errorText;
 		}

+ 3 - 0
o2web/source/x_desktop/js/base.js

@@ -622,6 +622,9 @@ o2.addReady(function () {
 
         layout.openLogin = function () {
             layout.desktop.type = "app";
+            layout.app = null;
+            var content = $("appContent") || $("layout");
+            if (content) content.empty();
             layout.authentication = new o2.xDesktop.Authentication({
                 "style": "flat",
                 "onLogin": _load.bind(layout)