yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CrLfTab

Browse Source
This commit is contained in:
Stephan
2017-09-23 10:08:18 +02:00
parent c1e2625de0
commit 5ba2ffcbf3
224 changed files with 709 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Models/ContentEditing/AssignedContentPermissions.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace Umbraco.Web.Models.ContentEditing
@@ -18,4 +18,4 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "permissions")]
public IDictionary<string, IEnumerable<Permission>> AssignedPermissions { get; set; }
}
}
}

2
src/Umbraco.Web/Models/ContentEditing/AssignedUserGroupPermissions.cs
View File

@@ -35,4 +35,4 @@ namespace Umbraco.Web.Models.ContentEditing
return result;
}
}
}
}

4
src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
View File

@@ -49,8 +49,8 @@ namespace Umbraco.Web.Models.ContentEditing
/// </remarks>
[DataMember(Name = "allowedActions")]
public IEnumerable<string> AllowedActions { get; set; }
[DataMember(Name = "isBlueprint")]
public bool IsBlueprint { get; set; }
}
}
}

2
src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Web.Models.ContentEditing
public ContentTypeBasic()
{
Blueprints = new Dictionary<int, string>();
}
}
/// <summary>
/// Overridden to apply our own validation attributes since this is not always required for other classes

4
src/Umbraco.Web/Models/ContentEditing/Permission.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Runtime.Serialization;
namespace Umbraco.Web.Models.ContentEditing
@@ -35,4 +35,4 @@ namespace Umbraco.Web.Models.ContentEditing
return this.MemberwiseClone();
}
}
}
}

2
src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs
View File

@@ -10,6 +10,6 @@ namespace Umbraco.Web.Models.ContentEditing
/// </summary>
[DataMember(Name = "score")]
public float Score { get; set; }
}
}

6
src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs
View File

@@ -17,8 +17,8 @@ namespace Umbraco.Web.Models.ContentEditing
public string TreeAlias { get; set; }
/// <summary>
/// This is optional but if specified should be the name of an angular service to format the search result.
/// </summary>
/// This is optional but if specified should be the name of an angular service to format the search result.
/// </summary>
[DataMember(Name = "jsSvc")]
public string JsFormatterService { get; set; }
@@ -32,4 +32,4 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "results")]
public IEnumerable<SearchResultItem> Results { get; set; }
}
}
}

14
src/Umbraco.Web/Models/ContentEditing/UserDetail.cs
View File

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
namespace Umbraco.Web.Models.ContentEditing
{
{
/// <summary>
/// Represents information for the current user
/// </summary>
@@ -29,25 +29,25 @@ namespace Umbraco.Web.Models.ContentEditing
[Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
[EditorBrowsable(EditorBrowsableState.Never)]
[ReadOnly(true)]
[DataMember(Name = "userType")]
[DataMember(Name = "userType")]
public string UserType { get; set; }
[ReadOnly(true)]
[DataMember(Name = "userGroups")]
public string[] UserGroups { get; set; }
[DataMember(Name = "userGroups")]
public string[] UserGroups { get; set; }
/// <summary>
/// Gets/sets the number of seconds for the user's auth ticket to expire
/// </summary>
[DataMember(Name = "remainingAuthSeconds")]
public double SecondsUntilTimeout { get; set; }
/// <summary>
/// The user's calculated start nodes based on the start nodes they have assigned directly to them and via the groups they're assigned to
/// </summary>
[DataMember(Name = "startContentIds")]
public int[] StartContentIds { get; set; }
/// <summary>
/// The user's calculated start nodes based on the start nodes they have assigned directly to them and via the groups they're assigned to
/// </summary>
@@ -58,7 +58,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// Returns a list of different size avatars
/// </summary>
[DataMember(Name = "avatars")]
public string[] Avatars { get; set; }
public string[] Avatars { get; set; }
/// <summary>
/// A list of sections the user is allowed to view.

6
src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs
View File

@@ -19,14 +19,14 @@ namespace Umbraco.Web.Models.ContentEditing
StartContentIds = new List<EntityBasic>();
StartMediaIds = new List<EntityBasic>();
}
/// <summary>
/// Gets the available cultures (i.e. to populate a drop down)
/// The key is the culture stored in the database, the value is the Name
/// </summary>
[DataMember(Name = "availableCultures")]
public IDictionary<string, string> AvailableCultures { get; set; }
[DataMember(Name = "startContentIds")]
public IEnumerable<EntityBasic> StartContentIds { get; set; }
@@ -75,4 +75,4 @@ namespace Umbraco.Web.Models.ContentEditing
public DateTime UpdateDate { get; set; }
}
}
}

2
src/Umbraco.Web/Models/ContentEditing/UserGroupBasic.cs
View File

@@ -34,4 +34,4 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "userCount")]
public int UserCount { get; set; }
}
}
}

4
src/Umbraco.Web/Models/ContentEditing/UserGroupDisplay.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
@@ -28,4 +28,4 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "assignedPermissions")]
public IEnumerable<AssignedContentPermissions> AssignedPermissions { get; set; }
}
}
}

6
src/Umbraco.Web/Models/ContentEditing/UserGroupPermissionsSave.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
@@ -27,7 +27,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// A dictionary of permissions to assign, the key is the user group id
/// </summary>
[DataMember(Name = "permissions")]
public IDictionary<int, IEnumerable<string>> AssignedPermissions { get; set; }
public IDictionary<int, IEnumerable<string>> AssignedPermissions { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
@@ -37,4 +37,4 @@ namespace Umbraco.Web.Models.ContentEditing
}
}
}
}
}

10
src/Umbraco.Web/Models/ContentEditing/UserGroupSave.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
@@ -21,11 +21,11 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "action", IsRequired = true)]
[Required]
public ContentSaveAction Action { get; set; }
[DataMember(Name = "alias", IsRequired = true)]
[Required]
public override string Alias { get; set; }
[DataMember(Name = "sections")]
public IEnumerable<string> Sections { get; set; }
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Models.ContentEditing
yield return new ValidationResult("A permission value cannot be null or empty", new[] { "AssignedPermissions" });
}
}
}
}
}
}

6
src/Umbraco.Web/Models/ContentEditing/UserInvite.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Models.ContentEditing
[EmailAddress]
public string Email { get; set; }
[DataMember(Name = "username")]
[DataMember(Name = "username")]
public string Username { get; set; }
[DataMember(Name = "message")]
@@ -37,4 +37,4 @@ namespace Umbraco.Web.Models.ContentEditing
yield return new ValidationResult("A username cannot be empty", new[] { "Username" });
}
}
}
}

4
src/Umbraco.Web/Models/ContentEditing/UserProfile.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "id", IsRequired = true)]
[Required]
public int UserId { get; set; }
[DataMember(Name = "name", IsRequired = true)]
[Required]
public string Name { get; set; }
@@ -25,4 +25,4 @@ namespace Umbraco.Web.Models.ContentEditing
return String.Compare(Name, ((UserProfile)obj).Name, StringComparison.Ordinal);
}
}
}
}

6
src/Umbraco.Web/Models/ContentEditing/UserSave.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Models.ContentEditing
public int[] StartContentIds { get; set; }
[DataMember(Name = "startMediaIds")]
public int[] StartMediaIds { get; set; }
public int[] StartMediaIds { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
@@ -52,4 +52,4 @@ namespace Umbraco.Web.Models.ContentEditing
yield return new ValidationResult("A user must be assigned to at least one group", new[] { "UserGroups" });
}
}
}
}