A product cannot be linked to itself through linkage attribute

Author: mgesing

src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs

@@ -3029,16 +3029,17 @@ public ActionResult ProductAttributeValueCreatePopup(int productAttributeAttribu
 			if (pva == null)
 				throw new ArgumentException(T("Products.Variants.NotFound", productAttributeAttributeId));
 
-			var model = new ProductModel.ProductVariantAttributeValueModel()
+			var model = new ProductModel.ProductVariantAttributeValueModel
 			{
+				ProductId = pva.ProductId,
 				ProductVariantAttributeId = productAttributeAttributeId,
 				DisplayColorSquaresRgb = pva.AttributeControlType == AttributeControlType.ColorSquares,
 				ColorSquaresRgb = "#000000",
 				Quantity = 1
 			};
 
-			//locales
 			AddLocales(_languageService, model.Locales);
+
 			return View(model);
 		}
 
@@ -3069,7 +3070,7 @@ public ActionResult ProductAttributeValueCreatePopup(string btnId, string formId
 
 			if (ModelState.IsValid)
 			{
-				var pvav = new ProductVariantAttributeValue()
+				var pvav = new ProductVariantAttributeValue
 				{
 					ProductVariantAttributeId = model.ProductVariantAttributeId,
 					Name = model.Name,
@@ -3108,8 +3109,9 @@ public ActionResult ProductAttributeValueEditPopup(int id)
 
 			var linkedProduct = _productService.GetProductById(pvav.LinkedProductId);
 
-			var model = new ProductModel.ProductVariantAttributeValueModel()
+			var model = new ProductModel.ProductVariantAttributeValueModel
 			{
+				ProductId = pvav.ProductVariantAttribute.ProductId,
 				ProductVariantAttributeId = pvav.ProductVariantAttributeId,
 				Name = pvav.Name,
 				Alias = pvav.Alias,
@@ -3136,7 +3138,6 @@ public ActionResult ProductAttributeValueEditPopup(int id)
 					model.QuantityInfo = " × {0}".FormatWith(model.Quantity);
 			}
 
-			//locales
 			AddLocales(_languageService, model.Locales, (locale, languageId) =>
 			{
 				locale.Name = pvav.GetLocalized(x => x.Name, languageId, false, false);

src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs

@@ -628,6 +628,7 @@ public ProductVariantAttributeValueModel()
 				Locales = new List<ProductVariantAttributeValueLocalizedModel>();
 			}
 
+			public int ProductId { get; set; }
 			public int ProductVariantAttributeId { get; set; }
 
 			[SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Alias")]

src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdateProductAttributeValue.cshtml

@@ -50,6 +50,7 @@
 				url: '@Url.Action("EntityPicker", "Common", new { area = "" })',
 				caption: '@T("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.LinkedProduct.AddNew")',
 				maxReturnValues: 1,
+				disableIds: '@Model.ProductId',
 				onLoadDialogBefore: function () {
 					$('#AddProductLinkageButton').button('loading').prop('disabled', true);
 				},

src/Presentation/SmartStore.Web/Content/smartstore.entitypicker.css

@@ -26,7 +26,7 @@
 	margin: 5px 0;
 	border-radius: 3px;
 }
-.entity-picker-list .item:hover {
+.entity-picker-list .item:not(.disable):hover {
 	cursor: pointer;
 }
 .entity-picker-list .item:not(.selected):hover {

src/Presentation/SmartStore.Web/Controllers/CommonController.cs

@@ -1055,10 +1055,11 @@ public ActionResult EntityPicker(EntityPickerModel model, FormCollection form)
 			model.PublishedString = T("Common.Published");
 			model.UnpublishedString = T("Common.Unpublished");
 
-			var disableIf = model.DisableIf.SplitSafe(",").Select(x => x.ToLower().Trim()).ToList();
-
 			try
 			{
+				var disableIf = model.DisableIf.SplitSafe(",").Select(x => x.ToLower().Trim()).ToList();
+				var disableIds = model.DisableIds.SplitSafe(",").Select(x => x.ToInt()).ToList();
+
 				using (var scope = new DbContextScope(_services.DbContext, autoDetectChanges: false, proxyCreation: true, validateOnSave: false, forceNoTracking: true))
 				{
 					if (model.Entity.IsCaseInsensitiveEqual("product"))
@@ -1118,6 +1119,10 @@ orderby grp.Key
 								{
 									item.Disable = (x.ProductTypeId != (int)ProductType.SimpleProduct);
 								}
+								else
+								{
+									item.Disable = disableIds.Contains(x.Id);
+								}
 
 								if (x.ProductTypeId == (int)ProductType.GroupedProduct)
 								{

src/Presentation/SmartStore.Web/Models/Common/EntityPickerModel.cs

@@ -14,6 +14,7 @@ public class EntityPickerModel : ModelBase
 		public string Entity { get; set; }
 		public bool HighligtSearchTerm { get; set; }
 		public string DisableIf { get; set; }
+		public string DisableIds { get; set; }
 		public string SearchTerm { get; set; }
 		public string ReturnField { get; set; }
 		public int MaxReturnValues { get; set; }

src/Presentation/SmartStore.Web/Scripts/smartstore.entityPicker.js

@@ -62,6 +62,7 @@
 			entity: 'product',
 			caption: ' ',
 			disableIf: '',
+			disableIds: '',
 			thumbZoomer: false,
 			highligtSearchTerm: true,
 			returnField: 'id',
@@ -133,7 +134,8 @@
 					"HighligtSearchTerm": opt.highligtSearchTerm,
 					"ReturnField": opt.returnField,
 					"MaxReturnValues": opt.maxReturnValues,
-					"DisableIf": opt.disableIf
+					"DisableIf": opt.disableIf,
+					"DisableIds": opt.disableIds
 				},
 				url: opt.url,
 				beforeSend: function () {

src/Presentation/SmartStore.Web/Views/Common/EntityPicker.cshtml

@@ -13,6 +13,7 @@
 			<input type="hidden" name="ReturnField" value="@Model.ReturnField" />
 			<input type="hidden" name="MaxReturnValues" value="@Model.MaxReturnValues" />
 			<input type="hidden" name="DisableIf" value="@Model.DisableIf" />
+			<input type="hidden" name="DisableIds" value="@Model.DisableIds" />
 			<input type="hidden" name="PageIndex" value="@Model.PageIndex" />
 
 			@if (Model.Entity.IsCaseInsensitiveEqual("product"))