diff --git a/WebsitePanel/Database/install_db.sql b/WebsitePanel/Database/install_db.sql index 7caae9f3..e3e4ed94 100644 --- a/WebsitePanel/Database/install_db.sql +++ b/WebsitePanel/Database/install_db.sql @@ -221,6 +221,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -785,6 +786,7 @@ CREATE TABLE [dbo].[Users]( [AdditionalParams] [nvarchar](max) COLLATE Latin1_General_CI_AS NULL, [LoginStatusId] [int] NULL, [FailedLogins] [int] NULL, + [SubscriberNumber] [nvarchar] (32) COLLATE Latin1_General_CI_AS NULL, CONSTRAINT [PK_Users] PRIMARY KEY CLUSTERED ( [UserID] ASC @@ -9867,7 +9869,7 @@ GO CREATE VIEW [dbo].[UsersDetailed] AS -SELECT U.UserID, U.RoleID, U.StatusID, U.LoginStatusId, U.FailedLogins, U.OwnerID, U.Created, U.Changed, U.IsDemo, U.Comments, U.IsPeer, U.Username, U.FirstName, U.LastName, U.Email, +SELECT U.UserID, U.RoleID, U.StatusID, U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, U.Created, U.Changed, U.IsDemo, U.Comments, U.IsPeer, U.Username, U.FirstName, U.LastName, U.Email, U.CompanyName, U.FirstName + ' ' + U.LastName AS FullName, UP.Username AS OwnerUsername, UP.FirstName AS OwnerFirstName, UP.LastName AS OwnerLastName, UP.RoleID AS OwnerRoleID, UP.FirstName + ' ' + UP.LastName AS OwnerFullName, UP.Email AS OwnerEmail, UP.RoleID AS Expr1, (SELECT COUNT(PackageID) AS Expr1 @@ -12101,6 +12103,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -12255,6 +12258,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -19612,6 +19616,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -19660,6 +19665,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -20023,6 +20029,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -20143,6 +20150,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -25328,6 +25336,7 @@ CREATE PROCEDURE [dbo].[AddUser] @OwnerID int, @RoleID int, @StatusID int, + @SubscriberNumber nvarchar(32), @LoginStatusID int, @IsDemo bit, @IsPeer bit, @@ -25372,6 +25381,7 @@ INSERT INTO Users OwnerID, RoleID, StatusID, + SubscriberNumber, LoginStatusID, Created, Changed, @@ -25402,6 +25412,7 @@ VALUES @OwnerID, @RoleID, @StatusID, + @SubscriberNumber, @LoginStatusID, GetDate(), GetDate(), @@ -25608,6 +25619,7 @@ CREATE PROCEDURE [dbo].[UpdateUser] @UserID int, @RoleID int, @StatusID int, + @SubscriberNumber nvarchar(32), @LoginStatusId int, @IsDemo bit, @IsPeer bit, @@ -25648,6 +25660,7 @@ AS UPDATE Users SET RoleID = @RoleID, StatusID = @StatusID, + SubscriberNumber = @SubscriberNumber, LoginStatusId = @LoginStatusId, Changed = GetDate(), IsDemo = @IsDemo, @@ -28895,6 +28908,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -29063,6 +29077,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -29116,6 +29131,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 7b51e1fa..3f505152 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -1063,7 +1063,7 @@ GO ALTER VIEW [dbo].[UsersDetailed] AS -SELECT U.UserID, U.RoleID, U.StatusID, U.LoginStatusId, U.FailedLogins, U.OwnerID, U.Created, U.Changed, U.IsDemo, U.Comments, U.IsPeer, U.Username, U.FirstName, U.LastName, U.Email, +SELECT U.UserID, U.RoleID, U.StatusID, U.LoginStatusId, U.SubscriberNumber, U.FailedLogins, U.OwnerID, U.Created, U.Changed, U.IsDemo, U.Comments, U.IsPeer, U.Username, U.FirstName, U.LastName, U.Email, U.CompanyName, U.FirstName + ' ' + U.LastName AS FullName, UP.Username AS OwnerUsername, UP.FirstName AS OwnerFirstName, UP.LastName AS OwnerLastName, UP.RoleID AS OwnerRoleID, UP.FirstName + ' ' + UP.LastName AS OwnerFullName, UP.Email AS OwnerEmail, UP.RoleID AS Expr1, (SELECT COUNT(PackageID) AS Expr1 @@ -1821,6 +1821,15 @@ ALTER TABLE [dbo].[ExchangeAccounts] ADD [SubscriberNumber] [nvarchar] (32) COLL END GO + +/****** Object: Table [dbo].[ExchangeAccounts] Extend Exchange Accounts with SubscriberNumber ******/ +IF NOT EXISTS(select 1 from sys.columns COLS INNER JOIN sys.objects OBJS ON OBJS.object_id=COLS.object_id and OBJS.type='U' AND OBJS.name='Users' AND COLS.name='SubscriberNumber') +BEGIN +ALTER TABLE [dbo].[Users] ADD [SubscriberNumber] [nvarchar] (32) COLLATE Latin1_General_CI_AS NULL +END +GO + + /****** Object: Table [dbo].[ExchangeOrganizations] ******/ ALTER TABLE [dbo].[ExchangeOrganizations] ALTER COLUMN [OrganizationID] [nvarchar](128) COLLATE Latin1_General_CI_AS NOT NULL GO @@ -2429,6 +2438,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4281,6 +4291,7 @@ ALTER PROCEDURE [dbo].[AddUser] @OwnerID int, @RoleID int, @StatusID int, + @SubscriberNumber nvarchar(32), @LoginStatusID int, @IsDemo bit, @IsPeer bit, @@ -4325,6 +4336,7 @@ INSERT INTO Users OwnerID, RoleID, StatusID, + SubscriberNumber, LoginStatusID, Created, Changed, @@ -4355,6 +4367,7 @@ VALUES @OwnerID, @RoleID, @StatusID, + @SubscriberNumber, @LoginStatusID, GetDate(), GetDate(), @@ -4403,6 +4416,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4459,6 +4473,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4513,6 +4528,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4564,6 +4580,7 @@ AS U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4659,6 +4676,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4710,6 +4728,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4756,6 +4775,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4807,6 +4827,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4901,6 +4922,7 @@ SELECT U.UserID, U.RoleID, U.StatusID, + U.SubscriberNumber, U.LoginStatusId, U.FailedLogins, U.OwnerID, @@ -4947,6 +4969,7 @@ ALTER PROCEDURE [dbo].[UpdateUser] @UserID int, @RoleID int, @StatusID int, + @SubscriberNumber nvarchar(32), @LoginStatusId int, @IsDemo bit, @IsPeer bit, @@ -4987,6 +5010,7 @@ AS UPDATE Users SET RoleID = @RoleID, StatusID = @StatusID, + SubscriberNumber = @SubscriberNumber, LoginStatusId = @LoginStatusId, Changed = GetDate(), IsDemo = @IsDemo, diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserInfo.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserInfo.cs index a960ad5c..3510003c 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserInfo.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserInfo.cs @@ -68,6 +68,7 @@ namespace WebsitePanel.EnterpriseServer private bool htmlMail; private string companyName; private bool ecommerceEnabled; + private string subscriberNumber; /// @@ -295,6 +296,14 @@ namespace WebsitePanel.EnterpriseServer set { this.ecommerceEnabled = value; } } + public string SubscriberNumber + { + get { return this.subscriberNumber; } + set { this.subscriberNumber = value; } + } + + + public string AdditionalParams { get; set; } public List Vlans diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Data/DataProvider.cs index 103f61cc..712764f3 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Data/DataProvider.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Data/DataProvider.cs @@ -199,7 +199,7 @@ namespace WebsitePanel.EnterpriseServer new SqlParameter("@Username", username)); } - public static int AddUser(int actorId, int ownerId, int roleId, int statusId, int loginStatusId, bool isDemo, + public static int AddUser(int actorId, int ownerId, int roleId, int statusId, string subscriberNumber, int loginStatusId, bool isDemo, bool isPeer, string comments, string username, string password, string firstName, string lastName, string email, string secondaryEmail, string address, string city, string country, string state, string zip, @@ -217,6 +217,7 @@ namespace WebsitePanel.EnterpriseServer new SqlParameter("@OwnerID", ownerId), new SqlParameter("@RoleID", roleId), new SqlParameter("@StatusId", statusId), + new SqlParameter("@SubscriberNumber", subscriberNumber), new SqlParameter("@LoginStatusId", loginStatusId), new SqlParameter("@IsDemo", isDemo), new SqlParameter("@IsPeer", isPeer), @@ -243,7 +244,7 @@ namespace WebsitePanel.EnterpriseServer return Convert.ToInt32(prmUserId.Value); } - public static void UpdateUser(int actorId, int userId, int roleId, int statusId, int loginStatusId, bool isDemo, + public static void UpdateUser(int actorId, int userId, int roleId, int statusId, string subscriberNumber, int loginStatusId, bool isDemo, bool isPeer, string comments, string firstName, string lastName, string email, string secondaryEmail, string address, string city, string country, string state, string zip, string primaryPhone, string secondaryPhone, string fax, string instantMessenger, bool htmlMail, @@ -255,6 +256,7 @@ namespace WebsitePanel.EnterpriseServer new SqlParameter("@ActorId", actorId), new SqlParameter("@RoleID", roleId), new SqlParameter("@StatusId", statusId), + new SqlParameter("@SubscriberNumber", subscriberNumber), new SqlParameter("@LoginStatusId", loginStatusId), new SqlParameter("@UserID", userId), new SqlParameter("@IsDemo", isDemo), diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs index 8ca4b341..14893de2 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs @@ -418,6 +418,7 @@ namespace WebsitePanel.EnterpriseServer user.OwnerId, user.RoleId, user.StatusId, + user.SubscriberNumber, user.LoginStatusId, user.IsDemo, user.IsPeer, @@ -562,6 +563,7 @@ namespace WebsitePanel.EnterpriseServer user.UserId, user.RoleId, user.StatusId, + user.SubscriberNumber, user.LoginStatusId, user.IsDemo, user.IsPeer, diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountDetails.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountDetails.ascx.resx index e25dd95b..a8cd0829 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountDetails.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountDetails.ascx.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Host: @@ -150,4 +150,7 @@ Status + + Subscriber Number: + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountEditDetails.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountEditDetails.ascx.resx index 00ef600f..3ebb934f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountEditDetails.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountEditDetails.ascx.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Cancel @@ -159,6 +159,9 @@ Secondary E-Mail: + + Subscriber Number: + User name: diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserCreateUserAccount.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserCreateUserAccount.ascx.resx index 403005f9..f76c9543 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserCreateUserAccount.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserCreateUserAccount.ascx.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Cancel @@ -201,4 +201,7 @@ * + + Subscriber Number: + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx index edd7473c..e7fda4fc 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx @@ -32,6 +32,14 @@
+ + 10 + 20 + 50 + 100 + + DisplayName Email @@ -44,7 +52,7 @@ + DataSourceID="odsAccountsPaged" PageSize="20">> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.cs index 9937409f..6200fd98 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.cs @@ -85,6 +85,17 @@ namespace WebsitePanel.Portal.ExchangeServer } } + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + gvContacts.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); + + // rebind grid + gvContacts.DataBind(); + + // bind stats + BindStats(); + } + protected void gvContacts_RowCommand(object sender, GridViewCommandEventArgs e) { if (e.CommandName == "DeleteItem") diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.designer.cs index 70d6ca5f..8a00f9e7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeContacts.ascx.designer.cs @@ -93,6 +93,15 @@ namespace WebsitePanel.Portal.ExchangeServer { /// protected global::System.Web.UI.WebControls.Localize locSearch; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// /// ddlSearchColumn control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx index f3f006d6..2b3afc28 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx @@ -32,6 +32,14 @@
+ + 10 + 20 + 50 + 100 + + DisplayName Email @@ -44,7 +52,7 @@ + DataSourceID="odsAccountsPaged" PageSize="20"> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.cs index 4c44664a..fcc1195e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.cs @@ -112,5 +112,18 @@ namespace WebsitePanel.Portal.ExchangeServer } } } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + gvLists.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); + + // rebind grid + gvLists.DataBind(); + + // bind stats + BindStats(); + + } + } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.designer.cs index a6826723..b2601fcd 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx.designer.cs @@ -93,6 +93,15 @@ namespace WebsitePanel.Portal.ExchangeServer { /// protected global::System.Web.UI.WebControls.Localize locSearch; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// /// ddlSearchColumn control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx index 03ffcb8f..54ed3f79 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx @@ -31,6 +31,16 @@
+ + 10 + 20 + 50 + + 100 + + + DisplayName Email @@ -45,7 +55,7 @@ + DataSourceID="odsAccountsPaged" PageSize="20"> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs index cbc3c2a8..561ffbdf 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs @@ -127,5 +127,18 @@ namespace WebsitePanel.Portal.ExchangeServer } } } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + gvMailboxes.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); + + // rebind grid + gvMailboxes.DataBind(); + + // bind stats + BindStats(); + + } + } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.designer.cs index 7f4b2d8d..e4f438f3 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.designer.cs @@ -84,6 +84,15 @@ namespace WebsitePanel.Portal.ExchangeServer { /// protected global::System.Web.UI.WebControls.Panel SearchPanel; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// /// ddlSearchColumn control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx index 5554db5d..6f9c5c4b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx @@ -34,6 +34,14 @@
+ + 10 + 20 + 50 + 100 + + DisplayName Email @@ -48,7 +56,7 @@ + DataSourceID="odsAccountsPaged" PageSize="20"> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs index 1402333b..54c07e70 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs @@ -197,5 +197,17 @@ namespace WebsitePanel.Portal.HostedSolution return GetThemedImage("Exchange/" + imgName); } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + gvUsers.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); + + // rebind grid + gvUsers.DataBind(); + + // bind stats + BindStats(); + } + } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.designer.cs index 2e383f01..931a2be7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.designer.cs @@ -84,6 +84,15 @@ namespace WebsitePanel.Portal.HostedSolution { /// protected global::System.Web.UI.WebControls.Panel SearchPanel; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// /// ddlSearchColumn control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx index 0fe66529..9768bca5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx @@ -31,6 +31,14 @@
+ + 10 + 20 + 50 + 100 + + DisplayName Email @@ -44,7 +52,7 @@ + meta:resourcekey="gvUsers" AllowPaging="true" AllowSorting="true" OnRowCommand="gvUsers_RowCommand" PageSize="20"> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.cs index cefe0967..307a6a7b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.cs @@ -96,5 +96,17 @@ namespace WebsitePanel.Portal.Lync } } + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + gvUsers.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); + + // rebind grid + gvUsers.DataBind(); + + // bind stats + BindStats(); + } + + } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.designer.cs index 4fd91d37..72e5ee37 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncUsers.ascx.designer.cs @@ -1,33 +1,4 @@ -// Copyright (c) 2012, Outercurve Foundation. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// - Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// - Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// - Neither the name of the Outercurve Foundation nor the names of its -// contributors may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // @@ -113,6 +84,15 @@ namespace WebsitePanel.Portal.Lync { /// protected global::System.Web.UI.WebControls.Panel SearchPanel; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// /// ddlSearchColumn control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx index db0084f7..e8044aff 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx @@ -13,6 +13,10 @@ + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs index 5492d0fe..f77f13a9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs @@ -61,6 +61,7 @@ namespace WebsitePanel.Portal // bind account details litUsername.Text = user.Username; litFullName.Text = Utils.EllipsisString(user.FirstName + " " + user.LastName, 25); + litSubscriberNumber.Text = Server.HtmlDecode(user.SubscriberNumber); litRole.Text = PanelFormatter.GetUserRoleName(user.RoleId); litCreated.Text = user.Created.ToString(); litUpdated.Text = user.Changed.ToString(); diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.designer.cs index 7bc11fb3..5f6d8c66 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.designer.cs @@ -1,40 +1,258 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.42 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ namespace WebsitePanel.Portal { + public partial class UserAccountDetails { - protected System.Web.UI.WebControls.Image imgUser; - protected System.Web.UI.WebControls.Image imgAdmin; - protected System.Web.UI.WebControls.Image imgReseller; - protected System.Web.UI.WebControls.Literal litUsername; - protected System.Web.UI.WebControls.Localize locFullName; - protected System.Web.UI.WebControls.Literal litFullName; - protected System.Web.UI.WebControls.Localize locEmail; - protected System.Web.UI.WebControls.HyperLink lnkEmail; - protected System.Web.UI.WebControls.Localize locRole; - protected System.Web.UI.WebControls.Literal litRole; - protected System.Web.UI.WebControls.Localize locCreated; - protected System.Web.UI.WebControls.Literal litCreated; - protected System.Web.UI.WebControls.Localize locUpdated; - protected System.Web.UI.WebControls.Literal litUpdated; - protected System.Web.UI.WebControls.HyperLink lnkSummaryLetter; - protected System.Web.UI.WebControls.HyperLink lnkEditAccountDetails; - protected System.Web.UI.WebControls.HyperLink lnkChangePassword; - protected System.Web.UI.WebControls.HyperLink lnkDelete; - protected WebsitePanel.Portal.CollapsiblePanel StatusHeader; - protected System.Web.UI.WebControls.Panel StatusPanel; - protected System.Web.UI.WebControls.Literal litStatus; - protected System.Web.UI.HtmlControls.HtmlGenericControl StatusBlock; - protected System.Web.UI.WebControls.ImageButton cmdActive; - protected System.Web.UI.WebControls.ImageButton cmdSuspend; - protected System.Web.UI.WebControls.ImageButton cmdCancel; + + /// + /// imgUser control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image imgUser; + + /// + /// imgAdmin control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image imgAdmin; + + /// + /// imgReseller control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image imgReseller; + + /// + /// litUsername control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litUsername; + + /// + /// locFullName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locFullName; + + /// + /// litFullName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litFullName; + + /// + /// locSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locSubscriberNumber; + + /// + /// litSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litSubscriberNumber; + + /// + /// locEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locEmail; + + /// + /// lnkEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink lnkEmail; + + /// + /// locRole control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locRole; + + /// + /// litRole control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litRole; + + /// + /// locCreated control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locCreated; + + /// + /// litCreated control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litCreated; + + /// + /// locUpdated control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize locUpdated; + + /// + /// litUpdated control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litUpdated; + + /// + /// lnkSummaryLetter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink lnkSummaryLetter; + + /// + /// lnkEditAccountDetails control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink lnkEditAccountDetails; + + /// + /// lnkChangePassword control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink lnkChangePassword; + + /// + /// lnkDelete control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink lnkDelete; + + /// + /// StatusHeader control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebsitePanel.Portal.CollapsiblePanel StatusHeader; + + /// + /// StatusPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel StatusPanel; + + /// + /// litStatus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litStatus; + + /// + /// StatusBlock control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl StatusBlock; + + /// + /// cmdActive control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton cmdActive; + + /// + /// cmdSuspend control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton cmdSuspend; + + /// + /// cmdCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton cmdCancel; } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx index b1886c81..39360cdf 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx @@ -35,6 +35,16 @@ ControlToValidate="txtLastName"> + + + + + + + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.cs index 44f33878..f0a48873 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.cs @@ -77,6 +77,7 @@ namespace WebsitePanel.Portal // account info txtFirstName.Text = Server.HtmlDecode(user.FirstName); txtLastName.Text = Server.HtmlDecode(user.LastName); + txtSubscriberNumber.Text = Server.HtmlDecode(user.SubscriberNumber); txtEmail.Text = user.Email; txtSecondaryEmail.Text = user.SecondaryEmail; ddlMailFormat.SelectedIndex = user.HtmlMail ? 1 : 0; @@ -128,6 +129,7 @@ namespace WebsitePanel.Portal // account info user.FirstName = Server.HtmlEncode(txtFirstName.Text); user.LastName = Server.HtmlEncode(txtLastName.Text); + user.SubscriberNumber = Server.HtmlEncode(txtSubscriberNumber.Text); user.Email = txtEmail.Text; user.SecondaryEmail = txtSecondaryEmail.Text; user.HtmlMail = ddlMailFormat.SelectedIndex == 1; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.designer.cs index d680a4c7..198b3a4b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountEditDetails.ascx.designer.cs @@ -1,31 +1,3 @@ -// Copyright (c) 2012, Outercurve Foundation. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// - Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// - Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// - Neither the name of the Outercurve Foundation nor the names of its -// contributors may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -130,6 +102,24 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.RequiredFieldValidator lastNameValidator; + /// + /// lblSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblSubscriberNumber; + + /// + /// txtSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSubscriberNumber; + /// /// lblEmail control. /// diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx index 5a92fa59..edbeb726 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx @@ -52,6 +52,16 @@ Display="Dynamic" ControlToValidate="txtLastName"> + + + + + + + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.cs index 62545c1b..229ae889 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.cs @@ -93,6 +93,7 @@ namespace WebsitePanel.Portal // account info user.FirstName = txtFirstName.Text; user.LastName = txtLastName.Text; + user.SubscriberNumber = txtSubscriberNumber.Text; user.Email = txtEmail.Text; user.SecondaryEmail = txtSecondaryEmail.Text; user.HtmlMail = ddlMailFormat.SelectedIndex == 1; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.designer.cs index 270f473d..66c72103 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateUserAccount.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.1434 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -130,6 +129,24 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.RequiredFieldValidator lastNameValidator; + /// + /// lblSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblSubscriberNumber; + + /// + /// txtSubscriberNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSubscriberNumber; + /// /// lblEmail control. ///