From d5bf70596d7081fdeb69d76be2a270675f087a88 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 20 Nov 2014 16:14:42 +0300
Subject: [PATCH] fix bugs - add processings.

---
 .../WebsitePanel/RDS/RDSCreateCollection.ascx            | 4 ++--
 .../App_LocalResources/RDSCollectionApps.ascx.resx       | 9 +++++++++
 .../App_LocalResources/RDSCollectionServers.ascx.resx    | 9 +++++++++
 .../RDS/UserControls/RDSCollectionServers.ascx           | 2 +-
 .../RDS/UserControls/RDSCollectionServers.ascx.cs        | 5 ++---
 .../DesktopModules/WebsitePanel/Scripts/AjaxUtils.js     | 8 +++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
index 7047502f..a90b852a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
@@ -24,7 +24,7 @@
 						    <td class="FormLabel150" style="width: 100px;"><asp:Localize ID="locCollectionName" runat="server" meta:resourcekey="locCollectionName" Text="Collection Name"></asp:Localize></td>
 						    <td>
                                 <asp:TextBox ID="txtCollectionName" runat="server" CssClass="NormalTextBox" />
-                                <asp:RequiredFieldValidator ID="valCollectionName" runat="server" ErrorMessage="*" ControlToValidate="txtCollectionName"></asp:RequiredFieldValidator>
+                                <asp:RequiredFieldValidator ID="valCollectionName" runat="server" ErrorMessage="*" ControlToValidate="txtCollectionName" ValidationGroup="SaveRDSCollection"></asp:RequiredFieldValidator>
 						    </td>
 					    </tr>
 					</table> 
@@ -37,7 +37,7 @@
                     </fieldset>
                       
 				    <div class="FormFooter">
-					    <asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" OnClick="btnSave_Click"></asp:Button>
+					    <asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" OnClick="btnSave_Click" ValidationGroup="SaveRDSCollection"></asp:Button>
 				    </div>
 				</div>
 			</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionApps.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionApps.ascx.resx
index aebc0900..0adb8a73 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionApps.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionApps.ascx.resx
@@ -117,12 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="btnAdd.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Getting Remote Apps ...');</value>
+  </data>
   <data name="btnAdd.Text" xml:space="preserve">
     <value>Add...</value>
   </data>
+  <data name="btnAddSelected.OnClientClick" xml:space="preserve">
+    <value>CloseProgressDialog();</value>
+  </data>
   <data name="btnAddSelected.Text" xml:space="preserve">
     <value>Add Apps</value>
   </data>
+  <data name="btnCancel.OnClientClick" xml:space="preserve">
+    <value>CloseProgressDialog();</value>
+  </data>
   <data name="btnCancel.Text" xml:space="preserve">
     <value>Cancel</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionServers.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionServers.ascx.resx
index 814527a9..58c6ab6f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionServers.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/App_LocalResources/RDSCollectionServers.ascx.resx
@@ -117,12 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="btnAdd.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Getting RDS Servers ...');</value>
+  </data>
   <data name="btnAdd.Text" xml:space="preserve">
     <value>Add...</value>
   </data>
+  <data name="btnAddSelected.OnClientClick" xml:space="preserve">
+    <value>CloseProgressDialog();</value>
+  </data>
   <data name="btnAddSelected.Text" xml:space="preserve">
     <value>Add Servers</value>
   </data>
+  <data name="btnCancel.OnClientClick" xml:space="preserve">
+    <value>CloseProgressDialog();</value>
+  </data>
   <data name="btnCancel.Text" xml:space="preserve">
     <value>Cancel</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx
index 272374a6..84ee87c1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx
@@ -94,7 +94,7 @@
 <asp:Button ID="btnAddServersFake" runat="server" style="display:none;" />
 <ajaxToolkit:ModalPopupExtender ID="AddServersModal" runat="server"
 	TargetControlID="btnAddServersFake" PopupControlID="AddServersPanel"
-	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelAdd" />
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelAdd"/>
 
 	</ContentTemplate>
 </asp:UpdatePanel>
\ No newline at end of file
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 f096ed25..6fb8d5f8 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
@@ -85,8 +85,8 @@ namespace WebsitePanel.Portal.RDS.UserControls
 		protected void btnAdd_Click(object sender, EventArgs e)
 		{
 			// bind all servers
-			BindPopupServers();
-
+			BindPopupServers(); 
+     
 			// show modal
 			AddServersModal.Show();
 		}
@@ -103,7 +103,6 @@ namespace WebsitePanel.Portal.RDS.UserControls
             List<RdsServer> selectedServers = GetPopUpGridViewServers();
 
             BindServers(selectedServers.ToArray(), true);
-
 		}
 
         protected void BindPopupServers()
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js
index 182477c9..11720aeb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js
@@ -43,7 +43,7 @@ function PadNumber(num)
 
 function EnableProgressDialog() {
     _showProgressDialog = true;
-    window.setInterval(DisableProgressDialog, 10); // disable dialog with some delay
+    //window.setInterval(DisableProgressDialog, 10); // disable dialog with some delay
 }
 
 function DisableProgressDialog() {
@@ -57,6 +57,12 @@ function ShowProgressDialog(title, popupBehavior)
     EnableProgressDialog();
 }
 
+function CloseProgressDialog()
+{
+    DisableProgressDialog();
+    $find('ModalPopupProperties').hide();
+}
+
 function ShowProgressDialogWithCallback(title)
 {
     _dialogTitle = title;