Changeset 13754 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs

Timestamp:

04/12/16 15:28:19 (8 years ago)

Author:

jlodewyc

Message:

#2582 User management done, start resource calendar

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs (modified) (4 diffs)

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

@@ -1 @@
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Access.Administration;
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
@@ -15 +16 @@
         private WebLoginService weblog;
         private HiveServiceLocatorWeb serviceLocator;
-        private HiveServiceClient serviceClient;
-        private HiveClientWeb clientWeb;
+        private AccessAdministrationClient accessClient;
         private Guid userId;
 
@@ -26 +26 @@
             _environment = env;
         }
-        private void init()
+        private bool init()
         {
             var u = HttpContext.Session.GetString("UserId");
             if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
             {
-                userId = Guid.Empty;
-                serviceLocator = new HiveServiceLocatorWeb();
-                serviceClient = serviceLocator.getHiveServiceClient();
-                clientWeb = new HiveClientWeb(serviceLocator, userId);
+                return false;
             }
             else
@@ -40 +37 @@
                 userId = Guid.Parse(u);
                 serviceLocator = weblog.getServiceLocator(userId);
-                serviceClient = serviceLocator.getHiveServiceClient();
-                clientWeb = weblog.getClientWeb(userId);
+                accessClient = weblog.getAccessAdminClient(userId);
+                return serviceLocator.CheckLogin();
+
             }
         }
         public IActionResult Index()
         {
-            init();
-            if (serviceLocator.CheckLogin())
+            
+            if (init())
             {
-
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 ViewBag.Title = "Resources";
                 return View("Index");