Changeset 13862


Ignore:
Timestamp:
05/30/16 16:52:40 (5 years ago)
Author:
jlodewyc
Message:

#2582 Start angular OKB manager, data loaded

Location:
branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager
Files:
15 added
1 deleted
30 edited

Legend:

Unmodified
Added
Removed
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs

    r13860 r13862  
    2020#endregion
    2121
    22 using HeuristicLab.Clients.Hive.WebJobManager.Services;
     22
    2323using Microsoft.AspNetCore.Mvc;
    2424using System.ServiceModel.Security;
    2525using System;
     26using Microsoft.AspNetCore.Http;
     27using HeuristicLab.Clients.Hive.WebJobManager.Services;
    2628using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
    27 using Microsoft.AspNetCore.Http;
     29using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2830
    2931namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
     
    100102                    {
    101103                        ViewBag.Title = "Login succesful";
    102                         weblog.newLoginOKBOnly(model,q);
     104                        weblog.newLoginOKBOnly(model,q, password);
    103105                        HttpContext.Session.SetString("UserId", model.userId.ToString());
    104106                        return RedirectToAction("Index", "Query");
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs

    r13860 r13862  
    2020#endregion
    2121
     22using HeuristicLab.Clients.Hive.WebJobManager.Services;
     23using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
     24using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
     25using HeuristicLab.Common;
     26using HeuristicLab.Optimization;
     27using Microsoft.AspNetCore.Hosting;
     28using Microsoft.AspNetCore.Http;
    2229using Microsoft.AspNetCore.Mvc;
    23 using HeuristicLab.Clients.Hive.WebJobManager.Services;
     30using Microsoft.Net.Http.Headers;
    2431using System;
    2532using System.Collections.Generic;
     33using System.IO;
    2634using System.Linq;
     35using System.Threading;
    2736using System.Threading.Tasks;
    28 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
    29 using Microsoft.AspNetCore.Http;
    30 
    31 using System.IO;
    32 using Microsoft.Net.Http.Headers;
    33 using Microsoft.AspNetCore.Hosting;
    34 using HeuristicLab.Common;
    35 using HeuristicLab.Optimization;
    36 using System.Threading;
    37 
    3837
    3938namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/QueryController.cs

    r13860 r13862  
    2121
    2222using HeuristicLab.Clients.Hive.WebJobManager.Services;
     23using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2324using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
    2425using Microsoft.AspNetCore.Http;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs

    r13860 r13862  
    2020#endregion
    2121
    22 using HeuristicLab.Clients.Access.Administration;
    2322using HeuristicLab.Clients.Hive.WebJobManager.Models;
    2423using HeuristicLab.Clients.Hive.WebJobManager.Services;
     24using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2525using Microsoft.AspNetCore.Hosting;
    2626using Microsoft.AspNetCore.Http;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

    r13860 r13862  
    2020#endregion
    2121
    22 using HeuristicLab.Clients.Access.Administration;
    2322using HeuristicLab.Clients.Hive.WebJobManager.Services;
     23using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2424using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
    2525using Microsoft.AspNetCore.Hosting;
     
    2727using Microsoft.AspNetCore.Mvc;
    2828using System;
    29 using System.Collections.Generic;
    30 using System.Linq;
    31 using System.Net.Mail;
    32 using System.ServiceModel.Security;
    33 using System.Threading.Tasks;
    3429
    3530namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
     
    191186                    accessClient.addMember(user, group);
    192187                }
    193                 return RedirectToAction("SelectUser", new { id = uid.ToString() });
     188                if (uid != Guid.Empty && uid == weblog.getCurrentUser(userId).currentUser.Id)
     189                    return RedirectToAction("Index", "Home");//Logout if current user
     190                else
     191                    return RedirectToAction("SelectUser", new { id = uid.ToString() });
    194192            }
    195193            else
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/CalendarHub.cs

    r13860 r13862  
    2121
    2222
    23 using HeuristicLab.Clients.Access.Administration;
    2423using HeuristicLab.Clients.Hive.WebJobManager.Services;
     24using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2525using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
    2626using Microsoft.AspNetCore.SignalR;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/QueryHub.cs

    r13860 r13862  
    2121
    2222using HeuristicLab.Clients.Hive.WebJobManager.Services;
     23using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2324using HeuristicLab.Clients.OKB.Query;
    2425using Microsoft.AspNetCore.SignalR;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/UserInfoHub.cs

    r13860 r13862  
    2121
    2222
    23 using HeuristicLab.Clients.Access.Administration;
    2423using HeuristicLab.Clients.Hive.WebJobManager.Controllers;
    2524using HeuristicLab.Clients.Hive.WebJobManager.Services;
     25using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2626using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
    2727using Microsoft.AspNetCore.SignalR;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Models/HiveWebUser.cs

    r13860 r13862  
    4848        public HiveWebUser updateUserInfo()
    4949        {
    50            
     50
    5151            try
    5252            {
     
    5757                access.RefreshUserGroups();
    5858                access.RefreshRoles();
    59            
     59
    6060                currentUser = access.Users.Find(x => x.UserName == username);
    6161                subscribedGroups = access.CallAccessService(x => x.GetUserGroupsOfUser(currentUser.Id));
    6262                accessRoles = access.CallAccessService(x => x.GetRolesOfCurrentUser());
    6363            }
    64             catch(SecurityAccessDeniedException e)
     64            catch (Exception e)
    6565            {
    66                 currentUser = new User();
    67                 currentUser.FullName = username;
    68                 subscribedGroups = new List<UserGroup>();
    69                 accessRoles = new List<Role>();
     66                if (e is SecurityAccessDeniedException || e is NullReferenceException)
     67                {
     68                    currentUser = new User();
     69                    currentUser.FullName = username;
     70                    subscribedGroups = new List<UserGroup>();
     71                    accessRoles = new List<Role>();
     72                }
     73                else
     74                    throw e;
    7075            }
    71            
     76
    7277            return this;
    7378
     
    7580        public bool HasUserAdminAccess()
    7681        {
    77             if(accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
     82            if (accessRoles.Find(x => x.Name == "AccessService Administrator") != null || weblog.getAccessAdminClient(webIdToken) != null)
    7883            {
    7984                return true;
     
    8388        public bool hasResourceAdminAccess()
    8489        {
    85             if(accessRoles.Find(x =>x.Name == "Hive Administrator" ) != null
    86                 && accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
     90            if ((accessRoles.Find(x => x.Name == "Hive Administrator") != null
     91                && accessRoles.Find(x => x.Name == "AccessService Administrator") != null))
    8792            {
    8893                return true;
     
    9297        public bool hasOKBAccess()
    9398        {
    94             if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null)
     99            if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null
     100                || weblog.getQueryClient(webIdToken) != null)
     101            {
     102                return true;
     103            }
     104            return false;
     105        }
     106        public bool hasOKBAdminAccess()
     107        {
     108            if (OKBOnly)
     109            {
     110                if (weblog.getOkbAdminClient(webIdToken) != null)
     111                    return true;
     112            }
     113            else if (accessRoles.Find(x => x.Name == "OKB Administrator") != null || weblog.getOkbAdminClient(webIdToken) != null)
    95114            {
    96115                return true;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/AccessAdministrationClient.cs

    r13844 r13862  
    2626using System.ServiceModel;
    2727using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
    28 using HeuristicLab.Clients.Hive.WebJobManager.Services;
    2928using System.Collections.Generic;
    3029using System.ServiceModel.Security;
    31 
    32 namespace HeuristicLab.Clients.Access.Administration
     30using HeuristicLab.Clients.Access;
     31
     32namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
    3333{
    3434    /// <summary>
     
    485485        }
    486486        #endregion
     487
     488        internal bool CheckLogin()
     489        {
     490            try
     491            {
     492                this.RefreshUsers();
     493                return true;
     494            }
     495            catch (SecurityAccessDeniedException e)
     496            {
     497                return false;
     498            }
     499            catch (MessageSecurityException e)
     500            {
     501                return false;
     502            }
     503        }
    487504    }
    488505}
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveAdminClientWeb.cs

    r13754 r13862  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Clients.Hive.WebJobManager.Services;
    27 
    28 namespace HeuristicLab.Clients.Hive
     27using System.ServiceModel.Security;
     28
     29namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
    2930{
    3031    [Item("Hive Administrator", "Hive Administrator")]
     
    99100                });
    100101            }
    101             catch
    102             {
    103                 throw;
     102            catch(Exception e)
     103            {
     104                throw e;
    104105            }
    105106            finally
     
    200201            }
    201202        }
     203
     204        internal bool CheckLogin()
     205        {
     206            try
     207            {
     208                this.Refresh();
     209                return true;
     210            }
     211            catch (MessageSecurityException e)
     212            {
     213                return false;
     214            }
     215            catch(SecurityAccessDeniedException e)
     216            {
     217                return false;
     218            }
     219        }
    202220    }
    203221}
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveClientWeb.cs

    r13860 r13862  
    3333using HeuristicLab.PluginInfrastructure;
    3434using TS = System.Threading.Tasks;
    35 using HeuristicLab.Clients.Hive.WebJobManager.Services;
    36 using HeuristicLab.Clients.Common.Properties;
    3735using Microsoft.AspNetCore.Hosting;
    38 using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    39 
    40 namespace HeuristicLab.Clients.Hive.WebJobManager
     36
     37namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
    4138{
    4239    /// <summary>
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs

    r13860 r13862  
    1111using System.Threading.Tasks;
    1212
    13 namespace HeuristicLab.Clients.Hive.WebJobManager.Services
     13namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
    1414{
    1515    /// <summary>
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/WebLoginService.cs

    r13860 r13862  
    2121
    2222
    23 using HeuristicLab.Clients.Access.Administration;
    2423using HeuristicLab.Clients.Hive.WebJobManager.Models;
     24using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2525using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
    2626using System;
     
    4848        private List<HiveWebUser> loggedinUsers;
    4949        private List<QueryWebClient> queryclients;
     50        private List<OkbAdministrationWebClient> okbmanclients;
    5051        /// <summary>
    5152        /// Service instance that keeps all the information per user seperated. Data is in  different lists so
     
    7778            adminclients = new List<HiveAdminClientWeb>();
    7879            loggedinUsers = new List<HiveWebUser>();
    79             queryclients = new List<QueryWebClient>();
     80            queryclients = new List<QueryWebClient>();
     81            okbmanclients = new List<OkbAdministrationWebClient>();
    8082        }
    8183        /// <summary>
     
    9496            loggedIn.Add(log);
    9597            locators.Add(loc);
     98           
    9699            webclients.Add(new HiveClientWeb(loc, log.userId));
    97100            fileopeners.Add(new FileOpeningService(log.userId));
    98101            jobopeners.Add(new FileOpeningService(log.userId));
    99             accessclients.Add(new AccessAdministrationClient(log.userId));
    100             adminclients.Add(new HiveAdminClientWeb(log.userId));
     102            var acc = new AccessAdministrationClient(log.userId);
     103            if(acc.CheckLogin())
     104                accessclients.Add(acc);
    101105            loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, false).updateUserInfo());
    102             queryclients.Add(new QueryWebClient(log.userId));
    103         }
    104         public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc)
     106            var ad = new HiveAdminClientWeb(log.userId);
     107            if(ad.CheckLogin())
     108                adminclients.Add(ad); 
     109            var qu = new QueryWebClient(log.userId);
     110            if(qu.CheckLogin())
     111                queryclients.Add(qu);
     112            var okb = new OkbAdministrationWebClient(log.userId);
     113            if (okb.CheckLogin())
     114                okbmanclients.Add(okb);
     115        }
     116        public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc, string pass)
    105117        {
    106118            destroyPossiblePreviousSessions(log.loginName);
     
    113125            queryclients.Add(qwc);
    114126            loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, true).updateUserInfo());
     127            var okb = new OkbAdministrationWebClient(log, pass);
     128            if (okb.CheckLogin())
     129                okbmanclients.Add(okb);
    115130           
    116131        }
     
    194209        {
    195210            return loggedinUsers.Find(x => x.webIdToken == id);
     211        }
     212
     213        public OkbAdministrationWebClient getOkbAdminClient(Guid id)
     214        {
     215            return okbmanclients.Find(x => x.UserId == id);
    196216        }
    197217        /// <summary>
     
    209229            adminclients.RemoveAll(x => x.userId == id);
    210230            queryclients.RemoveAll(x => x.UserId == id);
     231            okbmanclients.RemoveAll(x => x.UserId == id);
    211232            loggedIn.RemoveAll(x => x.userId == id);
    212233            loggedinUsers.RemoveAll(x => x.webIdToken == id);
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Startup.cs

    r13860 r13862  
    3232using System.Linq;
    3333using Microsoft.CodeAnalysis;
     34using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    3435
    3536namespace HeuristicLab.Clients.Hive.WebJobManager
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/FileOpeningViewModel.cs

    r13860 r13862  
    3030    /// Opening files
    3131    /// </summary>
    32     public class FileOpeningViewModel
     32    public class FileOpeningViewModel :MasterVM
    3333    {
    3434        public OptimizerHiveTask SelectedTask { get; set; }
     
    3737        public Experiment SelectedExperiment { get; set; }
    3838        public BatchRun SelectedBatchRun { get; set; }
    39         public string message { get; set; }
    40         public HiveWebUser currentUser { get; set; }
    4139
    42         public FileOpeningViewModel(HiveWebUser hwu)
    43         {
    44             currentUser = hwu;
    45         }
     40        public FileOpeningViewModel(HiveWebUser hwu) : base(hwu)
     41        { }
    4642    }
    4743}
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/JobViewModel.cs

    r13860 r13862  
    3030    /// Keeps list of loaded jobs
    3131    /// </summary>
    32     public class JobViewModel
     32    public class JobViewModel : MasterVM
    3333    {
    34         public HiveWebUser currentUser { get; set; }
    3534        public List<RefreshableJob> userJobs { get; set; }
    3635
     
    3837
    3938        public List<HiveTask> selectedHiveTasks { get; set; }
    40         public string message { get; set; }
    41         public JobViewModel(HiveWebUser hwu)
     39        public JobViewModel(HiveWebUser hwu) : base(hwu)
    4240        {
    4341            userJobs = null;
     
    4543            selectedHiveTasks = new List<HiveTask>();
    4644            message = "";
    47             currentUser = hwu;
    4845        }
    4946    }
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/UploadedJobViewModel.cs

    r13847 r13862  
    1111    /// Used to show data of uploaded files
    1212    /// </summary>
    13     public class UploadedJobViewModel
     13    public class UploadedJobViewModel : MasterVM
    1414    {
    15         public UploadedJobViewModel(HiveWebUser hwu)
     15        public UploadedJobViewModel(HiveWebUser hwu) : base(hwu)
    1616        {
    1717            FullDatePaths = new List<string>();
     
    2020            DisplayFilesPaths = new List<string>();
    2121            SelectedIndex = -1;
    22             currentUser = hwu;
    2322        }
    2423        public void clear()
     
    3534        public List<string> DisplayFilesPaths { get; set; }
    3635        public int SelectedIndex { get; set; }
    37         public string message { get; set; }
    38         public HiveWebUser currentUser { get; set; }
    3936       
    4037    }
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/LoginViewModel.cs

    r13860 r13862  
    2828    /// Used for login
    2929    /// </summary>
    30     public class LoginViewModel
     30    public class LoginViewModel // NOT MASTERVM => Starts the user login
    3131    {
    3232        /// <summary>
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/NavbarViewModel.cs

    r13860 r13862  
    2424namespace HeuristicLab.Clients.Hive.WebJobManager.ViewModels
    2525{
    26     public class NavbarViewModel
     26    public class NavbarViewModel : MasterVM
    2727    {
    2828
    2929        public string Active { get; set; }
    30         public HiveWebUser User { get; set; }
    3130
    32         public NavbarViewModel(string ac, HiveWebUser hwu )
     31        public NavbarViewModel(string ac, HiveWebUser hwu ) : base(hwu)
    3332        {
    3433            Active = ac;
    35             User = hwu;
    3634        }
    3735    }
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/User/UserViewModel.cs

    r13860 r13862  
    2020#endregion
    2121
    22 using HeuristicLab.Clients.Access.Administration;
    2322using HeuristicLab.Clients.Hive.WebJobManager.Models;
     23using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
    2424using System;
    2525using System.Collections.Generic;
     
    3131    /// ViewModel containing User/Group/Role data
    3232    /// </summary>
    33     public class UserViewModel
     33    public class UserViewModel : MasterVM
    3434    {
    35         public HiveWebUser currentUser { get; set; }
    36         public string message { get; set; }
    3735        public AccessAdministrationClient accessClient { get; set; }
    3836        public List<Access.User> users { get; set; }
     
    5250        /// </summary>
    5351        /// <param name="ac">AccessAdminClient for connection</param>
    54         public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu)
     52        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu) : base(hwu)
    5553        {
    56             currentUser = hwu;
    5754            users = new List<Access.User>();
    5855            accessClient = ac;
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

    r13860 r13862  
    88<div class="animated fadeIn">
    99    <!-- Main nav menu-->
    10     @Html.Partial("Navbar", new NavbarViewModel("Job", Model.currentUser))
     10    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.User))
    1111
    1212    <!-- Job menu-->
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

    r13860 r13862  
    1414    <div id="userId" style="display:none">@ViewBag.SessionId</div>
    1515    <!-- Main nav menu -->
    16     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
     16    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
    1717
    1818    <!-- Job menu-->
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml

    r13847 r13862  
    4848                    <span class="input-group-addon"
    4949                          id="basic-addon3">
    50                         .../uploads/@(Model.currentUser.currentUser.UserName != null ?  Model.currentUser.currentUser.UserName : Model.currentUser.currentUser.FullName)/
     50                        .../uploads/@(Model.User.currentUser.UserName != null ?  Model.User.currentUser.UserName : Model.User.currentUser.FullName)/
    5151                    </span>
    5252                    <input type="text"
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml

    r13860 r13862  
    7777    </li>
    7878    <li role="presentation"
     79        class="@(Model.Active == "OKBAdmin" ? "active" : "")
     80        @(Model.User.hasOKBAdminAccess() == false ? "disabled" : "")
     81        ">
     82        @if ( Model.User.hasOKBAdminAccess())
     83            {
     84            <a asp-controller="OkbManagement"
     85               asp-action="Index"
     86               accesskey="q">
     87                OKB management
     88            </a>
     89        }
     90        else
     91        {
     92            <a>OKB management</a>
     93        }
     94
     95    </li>
     96    <li role="presentation"
    7997        class="pull-right ">
    8098       
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

    r13860 r13862  
    44<div class="animated fadeIn">
    55
    6     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     6    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    77
    88    <ul class="nav nav-pills nav-justified">
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">
  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/gruntfile.js

    r13860 r13862  
    5757                files:{
    5858                    'wwwroot/js/hubs/calendarhubber.js': 'Scripts/Hubs/CalendarHubber.js',
    59                     'wwwroot/js/hubs/queryhubber.js': 'Scripts/Hubs/QueryHubber.js'
     59                    'wwwroot/js/hubs/queryhubber.js': 'Scripts/Hubs/QueryHubber.js',
     60                    'wwwroot/js/hubs/okbmanagerhubber.js': 'Scripts/Hubs/OkbManagerHubber.js'
    6061                }
    6162            }
Note: See TracChangeset for help on using the changeset viewer.