zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugs fix

Browse source
This commit is contained in:
vfedosevich 2015-04-15 05:23:08 -07:00
parent 599e9a8865
commit 84f9f63407
44 changed files with 560 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Account/PasswordChangeModel.cs
View file

@ -5,7 +5,7 @@ using WebsitePanel.WebDavPortal.Models.Common.EditorTemplates;
namespace WebsitePanel.WebDavPortal.Models.Account
{
public class PasswordChangeModel : BaseModel
public class PasswordChangeModel
{
[Display(ResourceType = typeof (Resources.UI), Name = "OldPassword")]
[Required(ErrorMessageResourceType = typeof (Resources.Messages), ErrorMessageResourceName = "Required")]

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Account/PasswordResetEmailModel.cs
View file

@ -4,7 +4,7 @@ using WebsitePanel.WebDavPortal.Resources;
namespace WebsitePanel.WebDavPortal.Models.Account
{
public class PasswordResetEmailModel : BaseModel
public class PasswordResetEmailModel
{
[Required]
[Display(ResourceType = typeof(Resources.UI), Name = "Email")]

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Account/PasswordResetSmsModel.cs
View file

@ -3,7 +3,7 @@ using WebsitePanel.WebDavPortal.Models.Common;
namespace WebsitePanel.WebDavPortal.Models.Account
{
public class PasswordResetSmsModel : BaseModel
public class PasswordResetSmsModel
{
[Required]
public string Sms { get; set; }

18
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Account/UserProfile.cs
View file

@ -4,10 +4,11 @@ using System.ComponentModel.DataAnnotations;
using System.Security.AccessControl;
using WebsitePanel.WebDavPortal.CustomAttributes;
using WebsitePanel.WebDavPortal.Models.Common;
using WebsitePanel.WebDavPortal.UI.Routes;
namespace WebsitePanel.WebDavPortal.Models.Account
{
public class UserProfile : BaseModel
public class UserProfile
{
[Display(ResourceType = typeof(Resources.UI), Name = "PrimaryEmail")]
[Required(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "Required")]
@ -18,8 +19,14 @@ namespace WebsitePanel.WebDavPortal.Models.Account
[Required(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "Required")]
public string DisplayName { get; set; }
public string AccountName { get; set; }
[Display(ResourceType = typeof(Resources.UI), Name = "FirstName")]
[Required(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "Required")]
public string FirstName { get; set; }
public string Initials { get; set; }
[Display(ResourceType = typeof(Resources.UI), Name = "LastName")]
[Required(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "Required")]
public string LastName { get; set; }
public string JobTitle { get; set; }
public string Company { get; set; }
@ -27,20 +34,29 @@ namespace WebsitePanel.WebDavPortal.Models.Account
public string Office { get; set; }
[PhoneNumber(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "PhoneNumberInvalid")]
[UniqueAdPhoneNumber(AccountRouteNames.PhoneNumberIsAvailible, ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "AlreadyInUse")]
[Display(ResourceType = typeof(Resources.UI), Name = "BusinessPhone")]
public string BusinessPhone { get; set; }
[PhoneNumber(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "PhoneNumberInvalid")]
[UniqueAdPhoneNumber(AccountRouteNames.PhoneNumberIsAvailible, ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "AlreadyInUse")]
[Display(ResourceType = typeof(Resources.UI), Name = "Fax")]
public string Fax { get; set; }
[Display(ResourceType = typeof(Resources.UI), Name = "HomePhone")]
[PhoneNumber(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "PhoneNumberInvalid")]
[UniqueAdPhoneNumber(AccountRouteNames.PhoneNumberIsAvailible, ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "AlreadyInUse")]
public string HomePhone { get; set; }
[Display(ResourceType = typeof(Resources.UI), Name = "MobilePhone")]
[Required(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "Required")]
[PhoneNumber(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "PhoneNumberInvalid")]
[UniqueAdPhoneNumber(AccountRouteNames.PhoneNumberIsAvailible, ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "AlreadyInUse")]
public string MobilePhone { get; set; }
[PhoneNumber(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "PhoneNumberInvalid")]
[Display(ResourceType = typeof(Resources.UI), Name = "Pager")]
[UniqueAdPhoneNumber(AccountRouteNames.PhoneNumberIsAvailible,ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "AlreadyInUse")]
public string Pager { get; set; }
[Url(ErrorMessageResourceType = typeof(Resources.Messages), ErrorMessageResourceName = "UrlInvalid", ErrorMessage = null)]

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs
View file

@ -5,7 +5,7 @@ using WebsitePanel.WebDavPortal.Models.Common;
namespace WebsitePanel.WebDavPortal.Models
{
public class AccountModel : BaseModel
public class AccountModel
{
[Required]
[Display(Name = @"Login")]

7
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Common/BaseModel.cs → WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Common/AjaxModel.cs
View file

@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Web.Mvc;
using WebsitePanel.WebDavPortal.Models.Common.Enums;
namespace WebsitePanel.WebDavPortal.Models.Common
{
public class BaseModel
public class AjaxModel
{
public BaseModel()
public AjaxModel()
{
Messages = new List<Message>();
}
@ -20,6 +19,6 @@ namespace WebsitePanel.WebDavPortal.Models.Common
Type = type,
Value = value
});
}
}
}
}

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Common/EditorTemplates/PasswordEditor.cs
View file

@ -4,7 +4,7 @@ using WebsitePanel.WebDavPortal.CustomAttributes;
namespace WebsitePanel.WebDavPortal.Models.Common.EditorTemplates
{
public class PasswordEditor : BaseModel
public class PasswordEditor
{
[Display(ResourceType = typeof(Resources.UI), Name = "NewPassword")]

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/ErrorModel.cs
View file

@ -3,7 +3,7 @@ using WebsitePanel.WebDavPortal.Models.Common;
namespace WebsitePanel.WebDavPortal.Models
{
public class ErrorModel : BaseModel
public class ErrorModel
{
public int HttpStatusCode { get; set; }
public string Message { get; set; }

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/DeleteFilesModel.cs
View file

@ -3,7 +3,7 @@ using WebsitePanel.WebDavPortal.Models.Common;
namespace WebsitePanel.WebDavPortal.Models.FileSystem
{
public class DeleteFilesModel : BaseModel
public class DeleteFilesModel : AjaxModel
{
public DeleteFilesModel()
{

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/ModelForWebDav.cs
View file

@ -6,7 +6,7 @@ using WebsitePanel.WebDavPortal.Models.Common;
namespace WebsitePanel.WebDavPortal.Models
{
public class ModelForWebDav : BaseModel
public class ModelForWebDav
{
public IEnumerable<IHierarchyItem> Items { get; set; }
public string UrlSuffix { get; set; }

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/OfficeOnlineModel.cs
View file

@ -2,7 +2,7 @@
namespace WebsitePanel.WebDavPortal.Models
{
public class OfficeOnlineModel : BaseModel
public class OfficeOnlineModel
{
public string Url { get; set; }
public string FileName { get; set; }