From ccf759ed27193cb460b7e1eaea132ab7e32bda00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 25 Apr 2020 17:28:53 +0300
Subject: [PATCH] Added DisplayName to ObjectExtensionPropertyInfo

---
 .../Volo.Abp.ObjectExtending.csproj           |  2 +-
 .../AbpObjectExtendingModule.cs               |  6 +++++-
 .../ObjectExtensionPropertyInfo.cs            | 20 +++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj b/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
index 43da943f8b..e50ff26d5f 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
index 9392429fd3..f8b585594e 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
@@ -1,7 +1,11 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
 
 namespace Volo.Abp.ObjectExtending
 {
+    [DependsOn(
+        typeof(AbpLocalizationAbstractionsModule)
+        )]
     public class AbpObjectExtendingModule : AbpModule
     {
 
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
index e6dbbfd6ce..f1d0392c76 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
@@ -2,11 +2,14 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.ObjectExtending
 {
     public class ObjectExtensionPropertyInfo
     {
+        [NotNull] private ILocalizableString _displayName;
+
         [NotNull]
         public ObjectExtensionInfo ObjectExtension { get; }
 
@@ -22,6 +25,17 @@ namespace Volo.Abp.ObjectExtending
         [NotNull]
         public List<Action<ObjectExtensionPropertyValidationContext>> Validators { get; }
 
+        [NotNull]
+        public ILocalizableString DisplayName
+        {
+            get => _displayName;
+            set
+            {
+                Check.NotNull(value, nameof(value));
+                _displayName = value;
+            }
+        }
+
         /// <summary>
         /// Indicates whether to check the other side of the object mapping
         /// if it explicitly defines the property. This property is used in;
@@ -40,14 +54,16 @@ namespace Volo.Abp.ObjectExtending
         public Dictionary<object, object> Configuration { get; }
 
         public ObjectExtensionPropertyInfo(
-            [NotNull] ObjectExtensionInfo objectExtension, 
-            [NotNull] Type type, 
+            [NotNull] ObjectExtensionInfo objectExtension,
+            [NotNull] Type type,
             [NotNull] string name)
         {
             ObjectExtension = Check.NotNull(objectExtension, nameof(objectExtension));
             Type = Check.NotNull(type, nameof(type));
             Name = Check.NotNull(name, nameof(name));
 
+            DisplayName = new FixedLocalizableString(Name);
+
             Configuration = new Dictionary<object, object>();
             ValidationAttributes = new List<ValidationAttribute>();
             Validators = new List<Action<ObjectExtensionPropertyValidationContext>>();