Changeset 13862 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

Timestamp:

05/30/16 16:52:40 (8 years ago)

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs (modified) (3 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 using Microsoft.AspNetCore.Hosting;
@@ -27 +27 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.ServiceModel.Security;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -191 +186 @@
                     accessClient.addMember(user, group);
                 }
-                return RedirectToAction("SelectUser", new { id = uid.ToString() });
+                if (uid != Guid.Empty && uid == weblog.getCurrentUser(userId).currentUser.Id)
+                    return RedirectToAction("Index", "Home");//Logout if current user
+                else
+                    return RedirectToAction("SelectUser", new { id = uid.ToString() });
             }
             else