From 6b836fc9f605d10c74a89236060623cee867e22c Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Fri, 21 Nov 2014 03:46:01 -0800
Subject: [PATCH] Assigned RDS Servers fixes

---
 .../RemoteDesktopServices/RemoteDesktopServicesController.cs   | 2 +-
 .../DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx    | 3 ++-
 .../WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index 9371ca1e..f2a3ca42 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -422,7 +422,7 @@ namespace WebsitePanel.EnterpriseServer
 
         private static RdsServersPaged GetOrganizationRdsServersPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
-            DataSet ds = DataProvider.GetRDSServersPaged(itemId, null, filterColumn, filterValue, sortColumn, startRow, maximumRows);
+            DataSet ds = DataProvider.GetRDSServersPaged(itemId, null, filterColumn, filterValue, sortColumn, startRow, maximumRows, ignoreRdsCollectionId: true);
 
             RdsServersPaged result = new RdsServersPaged();
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
index eab349e5..c1956968 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
@@ -55,9 +55,10 @@
 						    </asp:TemplateField>
 						    <asp:TemplateField>
 							    <ItemTemplate>
-									<asp:LinkButton ID="imgRemove1" runat="server" Text="Remove"
+									<asp:LinkButton ID="imgRemove1" runat="server" Text="Remove" Visible='<%# Eval("RdsCollectionId") == null %>'
 									    CommandName="DeleteItem" CommandArgument='<%# Eval("Id") %>' 
                                         meta:resourcekey="cmdDelete" OnClientClick="return confirm('Are you sure you want to remove selected server?')"></asp:LinkButton>
+                                    <asp:Label ID="lbRemove" Text="Remove" runat="server" Visible='<%# Eval("RdsCollectionId") != null %>'></asp:Label>
 							    </ItemTemplate>
 						    </asp:TemplateField>
 					    </Columns>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs
index 6fb8d5f8..b3ca3c35 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs
@@ -131,6 +131,7 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 servers.AddRange(GetGridViewServers(SelectedState.All));
 
             // add new servers
+
             if (newServers != null)
 			{
                 foreach (RdsServer newServer in newServers)