Merge

WebsitePanel/Database/update_db.sql

@@ -10848,7 +10848,8 @@ CREATE PROCEDURE [dbo].[GetSearchObject]
 	@MaximumRows int = 0,
 	@Recursive bit,
 	@ColType nvarchar(50) = '',
-	@FullType nvarchar(50) = ''
+	@FullType nvarchar(50) = '',
+	@OnlyFind bit
 )
 AS
 
@@ -10886,8 +10887,12 @@ DECLARE @Users TABLE
 	UserID int
 )
 INSERT INTO @Users (UserID)
-SELECT
+SELECT '
-	U.UserID
+
+IF @OnlyFind = 1
+SET @sqlUsers = @sqlUsers + 'TOP ' + CAST(@MaximumRows AS varchar(12)) + ' '
+
+SET @sqlUsers = @sqlUsers + 'U.UserID
 FROM UsersDetailed AS U
 WHERE 
 	U.UserID <> @UserID AND U.IsPeer = 0 AND
@@ -10937,8 +10942,12 @@ SET @sqlSpace = '
 		ItemID int
 	)
 	INSERT INTO @ItemsService (ItemID)
-	SELECT
+	SELECT '
-		SI.ItemID
+
+IF @OnlyFind = 1
+SET @sqlSpace = @sqlSpace + 'TOP ' + CAST(@MaximumRows AS varchar(12)) + ' '
+
+SET @sqlSpace = @sqlSpace +	'SI.ItemID
 	FROM ServiceItems AS SI
 	INNER JOIN Packages AS P ON P.PackageID = SI.PackageID
 	INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs

@@ -926,6 +926,22 @@ namespace WebsitePanel.EnterpriseServer {
             });
             return ((System.Data.DataSet)(results[0]));
         }
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSearchObjectQuickFind", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public System.Data.DataSet GetSearchObjectQuickFind(int userId, string filterColumn, string filterValue, int statusId, int roleId, string sortColumn, int maximumRows, string colType, string fullType)
+        {
+            object[] results = this.Invoke("GetSearchObjectQuickFind", new object[] {
+                        userId,
+                        filterColumn,
+                        filterValue,
+                        statusId,
+                        roleId,
+                        sortColumn,
+                        maximumRows,
+                        colType,
+                        fullType
+            });
+            return ((System.Data.DataSet)(results[0]));
+        }
 
         //TODO END
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs

@@ -141,7 +141,8 @@ namespace WebsitePanel.EnterpriseServer
 
         //TODO START
         public static DataSet GetSearchObject(int actorId, int userId, string filterColumn, string filterValue,
-           int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType, bool recursive)
+           int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType, 
+           bool recursive, bool onlyFind)
         {
             return SqlHelper.ExecuteDataset(ConnectionString, CommandType.StoredProcedure,
                 ObjectQualifier + "GetSearchObject",
@@ -156,7 +157,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@MaximumRows", maximumRows),
                 new SqlParameter("@Recursive", recursive),
                 new SqlParameter("@ColType", colType),
-                new SqlParameter("@FullType", fullType));
+                new SqlParameter("@FullType", fullType),
+                new SqlParameter("@OnlyFind", onlyFind));
         }
 
         //TODO END

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs

@@ -319,10 +319,12 @@ namespace WebsitePanel.EnterpriseServer
 
         //TODO START
         public static DataSet GetSearchObject(int userId, string filterColumn, string filterValue,
-            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType)
+            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, 
+            string fullType, bool onlyFind)
         {
             return DataProvider.GetSearchObject(SecurityContext.User.UserId, userId,
-                filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, fullType, false);
+                filterColumn, filterValue, statusId, roleId, sortColumn, startRow, 
+                maximumRows, colType, fullType, false, onlyFind);
         }
         //TODO END
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs

@@ -140,7 +140,14 @@ namespace WebsitePanel.EnterpriseServer
         public DataSet GetSearchObject(int userId, string filterColumn, string filterValue,
             int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType)
         {
-            return PackageController.GetSearchObject(userId, filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, fullType);
+            return PackageController.GetSearchObject(userId, filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, fullType, false);
+        }
+
+        [WebMethod]
+        public DataSet GetSearchObjectQuickFind(int userId, string filterColumn, string filterValue,
+            int statusId, int roleId, string sortColumn, int maximumRows, string colType, string fullType)
+        {
+            return PackageController.GetSearchObject(userId, filterColumn, filterValue, statusId, roleId, sortColumn, 0, maximumRows, colType, fullType, true);
         }
         //TODO END
 

WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx

@@ -5874,4 +5874,7 @@
   <data name="Error.SEND_USER_PASSWORD_RESET_SMS" xml:space="preserve">
     <value>Sms was not sent.</value>
   </data>
+  <data name="SearchObject.NOT_FOUND" xml:space="preserve">
+    <value>Not found</value>
+  </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs

@@ -54,9 +54,8 @@ namespace WebsitePanel.WebPortal
             }
             else
             {
-                DataSet dsObjectItems = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, null,
+                DataSet dsObjectItems = ES.Services.Packages.GetSearchObjectQuickFind(PanelSecurity.EffectiveUserId, null,
-                    String.Format("%{0}%", filterValue),
+                    String.Format("%{0}%", filterValue), 0, 0, "", iNumResults, columnType, fullType);
-                   0, 0, "", 0, iNumResults, columnType, fullType);
                 DataTable dt = dsObjectItems.Tables[2];
                 List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
                 for (int i = 0; i < dt.Rows.Count; ++i)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx

@@ -8,8 +8,6 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<script src="JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-
 <script language="javascript">
     function SelectAllCheckboxes(box) {
         $(".NormalGridView tbody :checkbox").attr("checked", $(box).attr("checked"));

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx.cs

@@ -49,6 +49,9 @@ namespace WebsitePanel.Portal
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             dnsRecords = new Dictionary<int, string>();
 
             gvDomains.PageSize = UsersHelper.GetDisplayItemsPerPage();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx

@@ -4,8 +4,6 @@
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/UserActions.ascx" TagName="UserActions" TagPrefix="wsp" %>
 
-<script src="JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-
 <script language="javascript">
     function SelectAllCheckboxes(box) {
         $(".NormalGridView tbody :checkbox").attr("checked", $(box).attr("checked"));

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs

@@ -33,6 +33,7 @@ using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.EnterpriseServer.Base.HostedSolution;
 using System.Collections.Generic;
+using System.Web.UI;
 
 namespace WebsitePanel.Portal.ExchangeServer
 {
@@ -52,6 +53,9 @@ namespace WebsitePanel.Portal.ExchangeServer
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             locTitle.Text = ArchivingBoxes ? GetLocalizedString("locTitleArchiving.Text") : GetLocalizedString("locTitle.Text");
 
             btnCreateMailbox.Visible = !ArchivingBoxes;

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx

@@ -5,8 +5,6 @@
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/UserActions.ascx" TagName="UserActions" TagPrefix="wsp" %>
 
-<script src="JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-
 <script language="javascript">
     function SelectAllCheckboxes(box) {
         $(".NormalGridView tbody :checkbox").attr("checked", $(box).attr("checked"));

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs

@@ -33,6 +33,7 @@ using System.Web.UI.WebControls;
 using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.EnterpriseServer.Base.HostedSolution;
+using System.Web.UI;
 
 namespace WebsitePanel.Portal.HostedSolution
 {
@@ -43,6 +44,9 @@ namespace WebsitePanel.Portal.HostedSolution
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
             if (!IsPostBack)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx

@@ -63,7 +63,7 @@
 	AllowPaging="True" AllowSorting="True"
 	CssSelectorClass="NormalGridView"
 	DataSourceID="odsObjectsPaged" EnableViewState="False"
-	EmptyDataText="gvObjects">
+	EmptyDataText=<%# GetSharedLocalizedString("SearchObject.NOT_FOUND") %>>
 	<Columns>
         <asp:TemplateField HeaderText="gvType" SortExpression="ColumnType">
             <HeaderTemplate>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx

@@ -5,8 +5,6 @@
 <%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/EditFeedsList.ascx" TagName="EditFeedsList" TagPrefix="uc6" %>
 
-<script src="/JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.cs

@@ -50,6 +50,9 @@ namespace WebsitePanel.Portal
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             if (!IsPostBack)
             {
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx

@@ -45,8 +45,9 @@
                 $("#<%= tbObjectId.ClientID %>").val(item.code.ItemID);
                 $("#<%= tbPackageId.ClientID %>").val(item.code.PackageID);
                 $("#<%= tbAccountId.ClientID %>").val(item.code.AccountID);
-                $("#<%= ImageButton1.ClientID %>").trigger("click");
+                var $ImgBtn = $("#<%= ImageButton1.ClientID %>");
-                $("#<%= ImageButton1.ClientID %>").attr('disabled','disabled');
+                $ImgBtn.trigger("click");
+                $ImgBtn.attr('disabled', 'disabled');
             }
         });
     });//]]>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx

@@ -5,8 +5,6 @@
 <%@ Register Src="WebsiteActions.ascx" TagName="WebsiteActions" TagPrefix="wsp" %>
 <%@ Register Src="MailAccountActions.ascx" TagName="MailAccountActions" TagPrefix="wsp" %>
 
-<script src="JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-
 <script language="javascript">
     function SelectAllCheckboxes(box) {
         $(".NormalGridView tbody :checkbox").attr("checked", $(box).attr("checked"));

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx.cs

@@ -93,6 +93,9 @@ namespace WebsitePanel.Portal.UserControls
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             //HideServiceColumns(gvWebSites);
 
             // set display preferences

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/MonitoringPage.aspx

@@ -10,8 +10,6 @@
 <html>
 <head runat="server">
 	<title></title>
-	<script src="/JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-	<script src="/JavaScript/jquery-ui-1.8.9.min.js" type="text/javascript"></script>
 	<link href="/App_Themes/Default/Styles/jquery-ui-1.8.9.css" rel="stylesheet" type="text/css" />
 </head>
 <body>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/MonitoringPage.aspx.cs

@@ -41,6 +41,10 @@ namespace WebsitePanel.Portal.VPSForPC
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+            cs.RegisterClientScriptInclude("jqueryui", ResolveUrl("~/JavaScript/jquery-ui-1.8.9.min.js"));
+
 			if (Page.IsPostBack == false)
 			{
 				SetDefaultMonitoringTimeFrame();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/VpsMonitoring.ascx

@@ -14,8 +14,6 @@
 <link type="text/css" href="/App_Themes/Default/Styles/jquery-ui-1.8.9.css" rel="stylesheet" />	
 <link type="text/css" href="/App_Themes/Default/Styles/jquery.window.css" rel="stylesheet" />	
 
-<script src="JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
-<script src="JavaScript/jquery-ui-1.8.9.min.js" type="text/javascript"></script>
 <script src="JavaScript/jquery.window.js" type="text/javascript"></script>
 
 <div runat="server" id="divWrapper">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/VpsMonitoring.ascx.cs

@@ -41,6 +41,10 @@ namespace WebsitePanel.Portal.VPSForPC
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+            cs.RegisterClientScriptInclude("jqueryui", ResolveUrl("~/JavaScript/jquery-ui-1.8.9.min.js"));
+
             if (!IsPostBack)
             {
                 hItemId.Value = PanelRequest.ItemID.ToString();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="WebApplicationGallery.ascx.cs" Inherits="WebsitePanel.Portal.WebApplicationGallery" %>
 <%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="uc1" %>
 <%@ Import Namespace="WebsitePanel.Portal" %>
-<script src="/JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
 
 <style>
 ul.WPIKeywordList {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx.cs

@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Web.UI;
 using System.Web.UI.WebControls;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.ResultObjects;
@@ -38,6 +39,9 @@ namespace WebsitePanel.Portal
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
 			// Maintains appearance settings corresponding to user's display preferences
 			gvApplications.PageSize = UsersHelper.GetDisplayItemsPerPage();
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx

@@ -164,7 +164,6 @@
 	</div>
 </div>
 
-<script src="/JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(document).ready(function () {
         $('#ShowSecurityPanelButton').click(function () {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs

@@ -73,6 +73,9 @@ namespace WebsitePanel.Portal
 
         protected void Page_Load(object sender, EventArgs e)
         {
+            ClientScriptManager cs = Page.ClientScript;
+            cs.RegisterClientScriptInclude("jquery", ResolveUrl("~/JavaScript/jquery-1.4.4.min.js"));
+
             if (HeliconApeStatus.IsInstalled)
             {
                 if (!IsPostBack)