From f9ab14dd955d7deb9aa7048c44e3302e4323552f Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Fri, 6 Mar 2015 04:20:49 -0800 Subject: [PATCH] Full Desktop Icon fix --- .../WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs | 4 ++++ .../WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs | 4 ++++ .../WebsitePanel/RDS/RDSLocalAdmins.ascx.cs | 6 ++++++ .../WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx | 1 + .../RDS/UserControls/RDSCollectionApps.ascx.cs | 9 ++++++++- .../RDS/UserControls/RDSCollectionUsers.ascx.cs | 4 ++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs index 4b4d828b..a5731696 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs @@ -60,6 +60,10 @@ namespace WebsitePanel.Portal.RDS { user.IsVIP = true; } + else + { + user.IsVIP = false; + } } users.SetUsers(remoteAppUsers.ToArray()); diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs index f18e7ad0..5bcd026b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs @@ -54,6 +54,10 @@ namespace WebsitePanel.Portal.RDS { user.IsVIP = true; } + else + { + user.IsVIP = false; + } } litCollectionName.Text = collection.DisplayName; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs index d65093ef..7ce5ca79 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs @@ -19,6 +19,12 @@ namespace WebsitePanel.Portal.RDS var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID); litCollectionName.Text = collection.DisplayName; + + foreach(var user in collectionLocalAdmins) + { + user.IsVIP = false; + } + users.SetUsers(collectionLocalAdmins); } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx index bbc141f1..36c6fb36 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx @@ -28,6 +28,7 @@ + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs index 0474d715..c293ea26 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs @@ -136,7 +136,7 @@ namespace WebsitePanel.Portal.RDS.UserControls var fullRemote = new StartMenuApp { DisplayName = string.Format("Full Desktop - {0}", host.ToLower()), - FilePath = "%SystemRoot%\\system32\\mstsc.exe", + FilePath = "c:\\windows\\system32\\mstsc.exe", RequiredCommandLine = string.Format("/v:{0}", host.ToLower()) }; @@ -213,6 +213,13 @@ namespace WebsitePanel.Portal.RDS.UserControls app.DisplayName = ((LinkButton)row.FindControl("lnkDisplayName")).Text; app.FilePath = ((HiddenField)row.FindControl("hfFilePath")).Value; app.RequiredCommandLine = ((HiddenField)row.FindControl("hfRequiredCommandLine")).Value; + var users = ((HiddenField)row.FindControl("hfUsers")).Value; + + if (users != null) + { + app.Users = new string[]{"New"}; + } + if (state == SelectedState.All || (state == SelectedState.Selected && chkSelect.Checked) || diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs index f4fbbd8f..40c4311a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs @@ -140,6 +140,10 @@ namespace WebsitePanel.Portal.RDS.UserControls { user.IsVIP = true; } + else + { + user.IsVIP = false; + } } accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();