Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Migrate ProductAttributeValueEditPopup.cshtml to AdminShared (ARCH-001 Phase 2)

KrzysztofPajakbbb5db0bbaf3
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/ProductAttributeValueEditPopup.cshtml
similarity index 82%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/ProductAttributeValueEditPopup.cshtml
index 187584377..7bc48dd2c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/ProductAttributeValueEditPopup.cshtml
@@ -1,10 +1,11 @@
@{
Layout = "";
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
//page title
- ViewBag.Title = Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"];
+ ViewBag.Title = Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"];
}
@model ProductModel.ProductAttributeValueModel
-<form id="ProductAttributeValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
+<form id="ProductAttributeValueEditPopup" asp-area="@area" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
@@ -16,7 +17,7 @@
<div class="x_title">
<div class="caption">
<i class="fa fa-cube"></i>
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"]
+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"]
</div>
</div>
<div class="x_content form">
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/ProductAttributeValueEditPopup.cshtml
deleted file mode 100644
index c5ad07ff7..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/ProductAttributeValueEditPopup.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"];
-}
-@model ProductModel.ProductAttributeValueModel
-<form id="ProductAttributeValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
- asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
- asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-cube"></i>
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"]
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/CreateOrUpdateProductAttributeValue" model="Model"/>
- </div>
- </div>
- </div>
- </div>
- <script>
- var mfp = $.magnificPopup.instance;
- $("#ProductAttributeValueEditPopup").submit(function (e) {
- e.preventDefault();
- var form = $(this);
- var url = form.attr('action');
- $.ajax({
- type: "POST",
- url: url,
- data: form.serialize(),
- success: function (data) {
- if (data == "") {
- mfp.close();
- $('#btnRefreshProductAttributesValues').attr('data-id', '@Model.ProductAttributeMappingId');
- $('#btnRefreshProductAttributesValues').click();
- } else {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- },
- callbacks: {
- open: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
- }
- }
- });
- });
- </script>
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml
deleted file mode 100644
index ce676d3c6..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"];
-}
-@model ProductModel.ProductAttributeValueModel
-<form id="ProductAttributeValueEditPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
- asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
- asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-cube"></i>
- @Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"]
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/CreateOrUpdateProductAttributeValue" model="Model"/>
- </div>
- </div>
- </div>
- </div>
- <script>
- var mfp = $.magnificPopup.instance;
- $("#ProductAttributeValueEditPopup").submit(function (e) {
- e.preventDefault();
- var form = $(this);
- var url = form.attr('action');
- $.ajax({
- type: "POST",
- url: url,
- data: form.serialize(),
- success: function (data) {
- if (data == "") {
- mfp.close();
- $('#btnRefreshProductAttributesValues').attr('data-id', '@Model.ProductAttributeMappingId');
- $('#btnRefreshProductAttributesValues').click();
- } else {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- },
- callbacks: {
- open: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
- }
- }
- });
- });
- </script>
-</form>
\ No newline at end of file