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

Timestamp:

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

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

Location:

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

Files:

• HomeController.cs (modified) (2 diffs)
• JobController.cs (modified) (1 diff)
• OkbManagementController.cs (added)
• QueryController.cs (modified) (1 diff)
• ResourceController.cs (modified) (1 diff)
• UserController.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+
 using Microsoft.AspNetCore.Mvc;
 using System.ServiceModel.Security;
 using System;
+using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -100 +102 @@
                     {
                         ViewBag.Title = "Login succesful";
-                        weblog.newLoginOKBOnly(model,q);
+                        weblog.newLoginOKBOnly(model,q, password);
                         HttpContext.Session.SetString("UserId", model.userId.ToString());
                         return RedirectToAction("Index", "Query");

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
+using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using HeuristicLab.Common;
+using HeuristicLab.Optimization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using Microsoft.Net.Http.Headers;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
-
-using System.IO;
-using Microsoft.Net.Http.Headers;
-using Microsoft.AspNetCore.Hosting;
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using System.Threading;
-
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers

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

@@ -21 +21 @@
 
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using Microsoft.AspNetCore.Http;

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

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