yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Niels Lyngsø
2020-04-15 17:46:12 +02:00
parent 627243c84c
commit b870ca7fcf
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/init.js
View File

@@ -18,14 +18,6 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
/** Listens for authentication and checks if our required assets are loaded, if/once they are we'll broadcast a ready event */
eventsService.on("app.authenticated", function (evt, data) {
// Lets check if the auth'd user has a start node set (befor trying to make the app ready)
const user = data.user;
if(user.startContentIds.length === 0 && user.startMediaIds.length === 0){
const args = { isTimedOut: true, noAccess: true };
eventsService.emit("app.notAuthenticated", args);
return;
}
assetsService._loadInitAssets().then(function () {
appReady(data);

3
src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
View File

@@ -120,8 +120,7 @@
<div ng-show="vm.view == 'login'">
<p>
<span ng-show="vm.isTimedOut"><localize key="login_timeout">Session timed out</localize>.</span>
<span ng-show="vm.noAccess"><localize key="login_nostartnodes">User has no start-nodes</localize>.</span>
<span ng-show="vm.isTimedOut"><localize key="login_timeout">Log in below</localize>.</span>
</p>
<div class="external-logins" ng-if="vm.externalLoginProviders.length > 0">