Migrating classes not inhering or having dependencies to EntityBasic

This commit is contained in:
Elitsa Marinovska
2020-10-27 15:42:59 +01:00
parent 507facbdaa
commit a6e0afe57d
21 changed files with 35 additions and 50 deletions

View File

@@ -25,6 +25,5 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "type")]
public NotificationStyle NotificationType { get; set; }
}
}

View File

@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
using Umbraco.Core;
namespace Umbraco.Web.Models.ContentEditing

View File

@@ -38,6 +38,5 @@ namespace Umbraco.Web.Models.ContentEditing
/// </summary>
[DataMember(Name = "config")]
public IDictionary<string, object> Config { get; set; }
}
}

View File

@@ -1,5 +1,4 @@
using System.Runtime.Serialization;
using Newtonsoft.Json.Linq;
namespace Umbraco.Web.Models.ContentEditing
{

View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Umbraco.Web.Models.ContentEditing
{
@@ -43,6 +39,5 @@ namespace Umbraco.Web.Models.ContentEditing
/// </summary>
[DataMember(Name = "value")]
public object Value { get; set; }
}
}

View File

@@ -1,7 +1,7 @@
namespace Umbraco.Web.Models.ContentEditing
{
using System.Runtime.Serialization;
using System.Runtime.Serialization;
namespace Umbraco.Web.Models.ContentEditing
{
/// <summary>
/// The macro parameter display.
/// </summary>

View File

@@ -1,5 +1,4 @@

using System.Linq;
using System.Linq;
using Umbraco.Core;
namespace Umbraco.Web.Models.ContentEditing
@@ -11,11 +10,11 @@ namespace Umbraco.Web.Models.ContentEditing
if (model.Exists(header, msg, type)) return;
model.Notifications.Add(new BackOfficeNotification()
{
Header = header,
Message = msg,
NotificationType = type
});
{
Header = header,
Message = msg,
NotificationType = type
});
}
public static void AddSuccessNotification(this INotificationModel model, string header, string msg)
@@ -23,11 +22,11 @@ namespace Umbraco.Web.Models.ContentEditing
if (model.Exists(header, msg, NotificationStyle.Success)) return;
model.Notifications.Add(new BackOfficeNotification()
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Success
});
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Success
});
}
public static void AddErrorNotification(this INotificationModel model, string header, string msg)
@@ -35,11 +34,11 @@ namespace Umbraco.Web.Models.ContentEditing
if (model.Exists(header, msg, NotificationStyle.Error)) return;
model.Notifications.Add(new BackOfficeNotification()
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Error
});
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Error
});
}
public static void AddWarningNotification(this INotificationModel model, string header, string msg)
@@ -47,11 +46,11 @@ namespace Umbraco.Web.Models.ContentEditing
if (model.Exists(header, msg, NotificationStyle.Warning)) return;
model.Notifications.Add(new BackOfficeNotification()
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Warning
});
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Warning
});
}
public static void AddInfoNotification(this INotificationModel model, string header, string msg)
@@ -59,11 +58,11 @@ namespace Umbraco.Web.Models.ContentEditing
if (model.Exists(header, msg, NotificationStyle.Info)) return;
model.Notifications.Add(new BackOfficeNotification()
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Info
});
{
Header = header,
Message = msg,
NotificationType = NotificationStyle.Info
});
}
private static bool Exists(this INotificationModel model, string header, string message, NotificationStyle notificationType) => model.Notifications.Any(x => x.Header.InvariantEquals(header) && x.Message.InvariantEquals(message) && x.NotificationType == notificationType);

View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;

View File

@@ -1,7 +1,6 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Umbraco.Core.Models.Membership;
namespace Umbraco.Web.Models.ContentEditing
{
@@ -23,6 +22,6 @@ namespace Umbraco.Web.Models.ContentEditing
int IComparable.CompareTo(object obj)
{
return String.Compare(Name, ((UserProfile)obj).Name, StringComparison.Ordinal);
}
}
}
}