Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cebebb9
Add action menu to create member type container
bjarnef Sep 19, 2023
4258804
Add methods to create, rename and delete container
bjarnef Sep 19, 2023
ebbadcc
Add object type for member type container
bjarnef Sep 19, 2023
5891543
Add member type container to dictionary mapping
bjarnef Sep 19, 2023
3075379
Add test methods
bjarnef Sep 19, 2023
d9e2fa0
Add container nodes
bjarnef Sep 19, 2023
ad318b5
Map member type container
bjarnef Sep 19, 2023
ec4a342
Implement MemberTypeContainerRepository
bjarnef Sep 19, 2023
a1df207
Adjust delete dialog
bjarnef Sep 19, 2023
77f041a
Containers only needed in member types tree
bjarnef Sep 19, 2023
14482fb
Add view for rename dialog
bjarnef Sep 19, 2023
2fc4099
Adjust move action
bjarnef Sep 19, 2023
006780e
Don't add delete action to container
bjarnef Sep 19, 2023
9462c34
Formatting
bjarnef Sep 19, 2023
c56331c
Only allow creating folder at root or in another folder
bjarnef Sep 19, 2023
47b9b9d
Remove ellipsis
bjarnef Sep 19, 2023
551246f
Formatting
bjarnef Sep 19, 2023
1ca7c66
Modern syntax
bjarnef Sep 19, 2023
821e54e
Alternative to GetNodesFromService method for member types for now
bjarnef Sep 19, 2023
3fc2729
Update save
bjarnef Sep 20, 2023
d3264aa
Localize many at once
bjarnef Sep 20, 2023
a419e0f
Localize many at once
bjarnef Sep 20, 2023
6ad9b53
Make GetEmpty for member type take parentId parameter
bjarnef Sep 20, 2023
0f14d56
Make function backwards compatible
bjarnef Sep 20, 2023
ac0eab9
Update comment
bjarnef Sep 20, 2023
e858c33
Fix typos
bjarnef Sep 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/Umbraco.Core/Constants-Icons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,62 +5,62 @@ public static partial class Constants
public static class Icons
{
/// <summary>
/// System default icon
/// System default icon.
/// </summary>
public const string DefaultIcon = Content;

/// <summary>
/// System blueprint icon
/// System blueprint icon.
/// </summary>
public const string Blueprint = "icon-blueprint";

/// <summary>
/// System content icon
/// System content icon.
/// </summary>
public const string Content = "icon-document";

/// <summary>
/// System content type icon
/// System content type icon.
/// </summary>
public const string ContentType = "icon-item-arrangement";

/// <summary>
/// System data type icon
/// System data type icon.
/// </summary>
public const string DataType = "icon-autofill";

/// <summary>
/// System dictionary icon
/// System dictionary icon.
/// </summary>
public const string Dictionary = "icon-book-alt";

/// <summary>
/// System generic folder icon
/// System generic folder icon.
/// </summary>
public const string Folder = "icon-folder";

/// <summary>
/// System language icon
/// System language icon.
/// </summary>
public const string Language = "icon-globe";

/// <summary>
/// System logviewer icon
/// System logviewer icon.
/// </summary>
public const string LogViewer = "icon-box-alt";

/// <summary>
/// System list view icon
/// System list view icon.
/// </summary>
public const string ListView = "icon-thumbnail-list";

/// <summary>
/// System macro icon
/// System macro icon.
/// </summary>
public const string Macro = "icon-settings-alt";

/// <summary>
/// System media file icon
/// System media file icon.
/// </summary>
public const string MediaFile = "icon-document";

Expand All @@ -70,92 +70,92 @@ public static class Icons
public const string MediaVideo = "icon-video";

/// <summary>
/// System media audio icon
/// System media audio icon.
/// </summary>
public const string MediaAudio = "icon-sound-waves";

/// <summary>
/// System media article icon
/// System media article icon.
/// </summary>
public const string MediaArticle = "icon-article";

/// <summary>
/// System media vector icon
/// System media vector icon.
/// </summary>
public const string MediaVectorGraphics = "icon-picture";

/// <summary>
/// System media folder icon
/// System media folder icon.
/// </summary>
public const string MediaFolder = "icon-folder";

/// <summary>
/// System media image icon
/// System media image icon.
/// </summary>
public const string MediaImage = "icon-picture";

/// <summary>
/// System media type icon
/// System media type icon.
/// </summary>
public const string MediaType = "icon-thumbnails";

/// <summary>
/// System member icon
/// System member icon.
/// </summary>
public const string Member = "icon-user";

/// <summary>
/// System member group icon
/// System member group icon.
/// </summary>
public const string MemberGroup = "icon-users-alt";

/// <summary>
/// System member type icon
/// System member type icon.
/// </summary>
public const string MemberType = "icon-users";

/// <summary>
/// System packages icon
/// System packages icon.
/// </summary>
public const string Packages = "icon-box";

/// <summary>
/// System property editor icon
/// System property editor icon.
/// </summary>
public const string PartialView = "icon-article";

/// <summary>
/// System property editor icon
/// System property editor icon.
/// </summary>
public const string PropertyEditor = "icon-autofill";

/// <summary>
/// Relation type icon
/// Relation type icon.
/// </summary>
public const string RelationType = "icon-trafic";

/// <summary>
/// Script type icon
/// Script type icon.
/// </summary>
public const string Script = "icon-script";

/// <summary>
/// Stylesheet type icon
/// Stylesheet type icon.
/// </summary>
public const string Stylesheet = "icon-brackets";

/// <summary>
/// System member icon
/// System member icon.
/// </summary>
public const string Template = "icon-layout";

/// <summary>
/// System user icon
/// System user icon.
/// </summary>
public const string User = "icon-user";

/// <summary>
/// System user group icon
/// System user group icon.
/// </summary>
public const string UserGroup = "icon-users";
}
Expand Down
4 changes: 4 additions & 0 deletions src/Umbraco.Core/Constants-ObjectTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public static class ObjectTypes

public static readonly Guid MediaTypeContainer = new(Strings.MediaTypeContainer);

public static readonly Guid MemberTypeContainer = new(Strings.MemberTypeContainer);

public static readonly Guid DataType = new(Strings.DataType);

public static readonly Guid Document = new(Strings.Document);
Expand Down Expand Up @@ -73,6 +75,8 @@ public static class Strings

public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4";

public const string MemberTypeContainer = "59EF5767-7223-4ABC-B229-72821DC711B9";

public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";

public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
Expand Down
4 changes: 4 additions & 0 deletions src/Umbraco.Core/Constants-UdiEntityType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ public static class UdiEntityType

// TODO: What is this? This alias is only used for the blue print tree to render the blueprint's document type, it's not a real udi type
public const string DocumentTypeBluePrints = "document-type-blueprints";

public const string MediaType = "media-type";
public const string MediaTypeContainer = "media-type-container";

public const string DataType = "data-type";
public const string DataTypeContainer = "data-type-container";

public const string MemberType = "member-type";
public const string MemberTypeContainer = "member-type-container";
public const string MemberGroup = "member-group";

public const string RelationType = "relation-type";
Expand Down
2 changes: 2 additions & 0 deletions src/Umbraco.Core/EmbeddedResources/Lang/da.xml
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@
<key alias="allMembers">Alle medlemmer</key>
<key alias="memberGroupNoProperties">Medlemgrupper har ingen yderligere egenskaber til redigering.</key>
<key alias="2fa">Totrinsbekræftelse</key>
<key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
<key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
</area>
<area alias="contentType">
<key alias="copyFailed">Kopiering af indholdstypen fejlede</key>
Expand Down
2 changes: 2 additions & 0 deletions src/Umbraco.Core/EmbeddedResources/Lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@
<key alias="allMembers">All Members</key>
<key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
<key alias="2fa">Two-Factor Authentication</key>
<key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
<key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
</area>
<area alias="contentType">
<key alias="copyFailed">Failed to copy content type</key>
Expand Down
2 changes: 2 additions & 0 deletions src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@
<key alias="memberLockoutNotEnabled">Lockout is not enabled for this member</key>
<key alias="memberNotInGroup">The member is not in group '%0%'</key>
<key alias="2fa">Two-Factor Authentication</key>
<key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
<key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
</area>
<area alias="contentType">
<key alias="copyFailed">Failed to copy content type</key>
Expand Down
4 changes: 4 additions & 0 deletions src/Umbraco.Core/Extensions/UdiGetterExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ public static GuidUdi GetUdi(this EntityContainer entity)
{
entityType = Constants.UdiEntityType.MediaTypeContainer;
}
else if (entity.ContainedObjectType == Constants.ObjectTypes.MemberType)
{
entityType = Constants.UdiEntityType.MemberTypeContainer;
}
else
{
throw new NotSupportedException(string.Format(
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Core/Models/EntityContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public sealed class EntityContainer : TreeEntityBase, IUmbracoEntity
{ Constants.ObjectTypes.DataType, Constants.ObjectTypes.DataTypeContainer },
{ Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.DocumentTypeContainer },
{ Constants.ObjectTypes.MediaType, Constants.ObjectTypes.MediaTypeContainer },
{ Constants.ObjectTypes.MemberType, Constants.ObjectTypes.MemberTypeContainer },
};

/// <summary>
Expand Down
Loading