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.

Fix - User Fields #157 (#176)

Krzysztof Pajak186a43fcf324
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
index c803006a6..835d29f9d 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
@@ -77,7 +77,6 @@ namespace Grand.Business.Common.Services.Security
StandardPermission.ManageSystem,
StandardPermission.ManageFiles,
StandardPermission.ManagePictures,
- StandardPermission.ManageUserFields,
StandardPermission.HtmlEditorManagePictures,
StandardPermission.ManageScheduleTasks,
StandardPermission.DisplayPrices,
@@ -164,7 +163,6 @@ namespace Grand.Business.Common.Services.Security
StandardPermission.ManageSystem,
StandardPermission.ManageFiles,
StandardPermission.ManagePictures,
- StandardPermission.ManageUserFields,
StandardPermission.HtmlEditorManagePictures,
StandardPermission.ManageScheduleTasks,
StandardPermission.DisplayPrices,
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs
index fe746f239..151cc4e91 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs
@@ -70,7 +70,6 @@
public const string System = "ManageSystem";
public const string Files = "ManageFiles";
public const string Pictures = "ManagePictures";
- public const string UserFields = "UserFields";
public const string HtmlEditor = "HtmlEditor.ManagePictures";
public const string ScheduleTasks = "ManageScheduleTasks";
public const string AllowUseApi = "AllowUseApi";
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
index 11ddff603..eff0b358c 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
@@ -57,13 +57,6 @@ namespace Grand.Business.Common.Services.Security
Area = "Admin area",
Category = CategorySystem
};
- public static readonly Permission ManageUserFields = new Permission
- {
- Name = "Manage user Fields",
- SystemName = PermissionSystemName.UserFields,
- Area = "Admin area",
- Category = CategorySystem
- };
public static readonly Permission HtmlEditorManagePictures = new Permission
{
Name = "HTML Editor. Manage pictures",
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.cshtml
index f1cdb724a..f8c3acfdf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.cshtml
@@ -37,11 +37,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="4">
<content>
<div>
- @{
- ViewData["ObjectType"] = "BlogPost";
- ViewData["TabIndex"] = 4;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
index 4d265b710..d2c8c9e77 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
@@ -42,11 +42,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="4">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Brand";
- ViewData["TabIndex"] = 4;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
index 775169717..d58473b3f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
@@ -50,11 +50,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="5">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Category";
- ViewData["TabIndex"] = 5;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
index 068bbc594..45f91ca78 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
@@ -49,11 +49,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="5">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Collection";
- ViewData["TabIndex"] = 5;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.cshtml
index 155666794..8d0412aaf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.cshtml
@@ -35,11 +35,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="4">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Course";
- ViewData["TabIndex"] = 4;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_Lesson.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_Lesson.cshtml
index bd34e278d..aa88216f2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_Lesson.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_Lesson.cshtml
@@ -14,11 +14,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">
<content>
<div>
- @{
- ViewData["ObjectType"] = "CourseLesson";
- ViewData["TabIndex"] = 2;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
index 619444230..b9f675035 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
@@ -35,11 +35,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">
<content>
<div>
- @{
- ViewData["ObjectType"] = "CustomerGroup";
- ViewData["TabIndex"] = 3;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabRequirements.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabRequirements.cshtml
index 5c0676335..d06784fa1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabRequirements.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabRequirements.cshtml
@@ -1,6 +1,4 @@
@model DiscountModel
-@using Grand.Domain.Discounts;
-@using Grand.Web.Common.Page;
@{
<vc:admin-widget widget-zone="discount_details_requirements_top" additional-data="Model" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.cshtml
index fd23b6fee..6f9143bec 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.cshtml
@@ -1,8 +1,5 @@
@model DiscountModel
-
-<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/jquery.tmpl.min.js"></script>
-
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
<admin-tabstrip name="discount-edit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/_CreateOrUpdateDocument.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/_CreateOrUpdateDocument.cshtml
index c4c50121d..d0f324b74 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/_CreateOrUpdateDocument.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/_CreateOrUpdateDocument.cshtml
@@ -24,11 +24,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Document";
- ViewData["TabIndex"] = 2;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
index 66e33fda3..4ae0712b8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
@@ -5,8 +5,6 @@
@{
//has "Manage Documents" permission?
var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
- //has "Manage User fields" permission?
- var canManageUserFields = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageUserFields);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
@@ -46,22 +44,15 @@
</div>
</content>
</tabstrip-item>
- @if (canManageUserFields)
- {
- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="4">
- <content>
- <div>
- <div class="form-horizontal">
- @{
- ViewData["ObjectType"] = "MerchandiseReturn";
- ViewData["TabIndex"] = 4;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
- </div>
+ <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="4">
+ <content>
+ <div>
+ <div class="form-horizontal">
+ <partial name="_UserFields" model="Model" />
</div>
- </content>
- </tabstrip-item>
- }
+ </div>
+ </content>
+ </tabstrip-item>
<vc:admin-widget widget-zone="merchandisereturn_details_tabs" additional-data="Model" />
</items>
</admin-tabstrip>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
index d76127442..f6ac80b70 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
@@ -5,7 +5,6 @@
ViewBag.Title = Loc["Admin.Orders.EditOrderDetails"];
//has "Manage Documents" permission?
var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
- var canManageUserFields = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageUserFields);
var canManageMessageQueue = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageMessageQueue);
}
<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="Edit" method="post" id="order-form">
@@ -101,25 +100,18 @@
</content>
</tabstrip-item>
}
- @if (canManageUserFields)
- {
- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="6">
- <content>
- <div>
- <div class="form-actions">
- <input type="submit" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" asp-action="EditUserFields" class="k-button" />
- </div>
- <div class="form-horizontal">
- @{
- ViewData["ObjectType"] = "Order";
- ViewData["TabIndex"] = 6;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
- </div>
+ <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="6">
+ <content>
+ <div>
+ <div class="form-actions">
+ <input type="submit" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" asp-action="EditUserFields" class="k-button" />
</div>
- </content>
- </tabstrip-item>
- }
+ <div class="form-horizontal">
+ <partial name="_UserFields" model="Model" />
+ </div>
+ </div>
+ </content>
+ </tabstrip-item>
@if (canManageMessageQueue)
{
<tabstrip-item text="@Loc["Admin.Orders.Notifications"]" tab-index="7">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/_CreateOrUpdate.cshtml
index 05db10ca1..3adbcb3dd 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/_CreateOrUpdate.cshtml
@@ -21,11 +21,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Page";
- ViewData["TabIndex"] = 2;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
index 7e25c4278..36a9826d0 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
@@ -147,11 +147,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="18">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Product";
- ViewData["TabIndex"] = 18;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.cshtml
index 2c64a6f1e..becb20bb6 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.cshtml
@@ -31,11 +31,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">
<content>
<div>
- @{
- ViewData["ObjectType"] = "ProductAttribute";
- ViewData["TabIndex"] = 3;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/HeadAdmin.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/HeadAdmin.cshtml
index bc41f0edd..c41175782 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/HeadAdmin.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/HeadAdmin.cshtml
@@ -54,5 +54,5 @@
<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/summernote/summernote.min.js"></script>
<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/elfinder/js/elfinder.min.js"></script>
<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/magnific-popup/jquery.magnific-popup.min.js"></script>
-
+ <script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/jquery.tmpl.min.js"></script>
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
index 9eceb522c..e9e74d68a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
@@ -1,159 +1,134 @@
@model Grand.Infrastructure.Models.BaseEntityModel
@inject Grand.Business.Common.Interfaces.Stores.IStoreService storeService
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
@{
+ var userFields = Model.UserFields.ToList();
var stores = (await storeService.GetAllStores()).Select(store => new SelectListItem
{
Text = store.Shortcut,
Value = store.Id,
}).ToList();
- var permission = await permissionService.Authorize(Grand.Business.Common.Services.Security.PermissionSystemName.UserFields);
}
-@if (!string.IsNullOrEmpty(Model.Id))
-{
- <vc:admin-widget widget-zone="userfield_details_info_top" additional-data="Model" />
- if (Model.UserFields.Any())
+<vc:admin-widget widget-zone="userfield_details_info_top" additional-data="Model" />
+<div class="form-horizontal form-userfield" id="form-userfield">
+ @for (int item = 0; item < userFields.Count; item++)
{
- <div class="panel panel-default">
- <div class="form-horizontal">
- @for (int item = 0; item < Model.UserFields.Count; item++)
- {
- <div class="form-body">
- <div class="form-group">
- <label class="control-label col-md-3 col-sm-3">@Model.UserFields[item].Key</label>
- <div class="col-md-6 col-sm-6">
- <admin-input asp-for="@Model.UserFields[item].Value" />
- <input type="hidden" asp-for="@Model.UserFields[item].Key" />
- <span asp-validation-for="@Model.UserFields[item].Value"></span>
- </div>
- <div class="col-md-3 col-sm-3 input-group custom-input-group">
- <admin-select asp-for="@Model.UserFields[item].StoreId" asp-items="@stores" />
- <span class="input-group-addon btn red" onclick="gadelete('@Model.UserFields[item].Key', '@Model.UserFields[item].StoreId')"><i class="fa fa fa-times"></i></span>
- </div>
- </div>
- </div>
- }
+ <div id="UserFieldsItem_@item" class="form-body">
+ <div class="form-group">
+ <label class="control-label col-md-3 col-sm-3">@userFields[item].Key</label>
+ <div class="col-md-6 col-sm-6">
+ <admin-input asp-for="@userFields[item].Value" />
+ <input type="hidden" asp-for="@userFields[item].Key" />
+ </div>
+ <div class="col-md-3 col-sm-3 input-group custom-input-group">
+ <admin-select asp-for="@userFields[item].StoreId" asp-items="@stores" />
+ <span class="input-group-addon btn red deleteuserfield" data-id="@item" onclick="deleteUserFields(@item)"><i class="fa fa fa-times"></i></span>
+ </div>
</div>
</div>
- <script>
- function gadelete(key, store) {
- if (confirm('@Loc["Admin.Common.AreYouSure"]')) {
- var postData = {
- Key: key,
- StoreId: store,
- Value: 'empty',
- ObjectType: "@ViewData["ObjectType"]",
- SelectedTab: '@ViewData["TabIndex"]',
- Id: '@Model.Id',
- };
- addAntiForgeryToken(postData);
- $.ajax({
- cache: false,
- type: "POST",
- url: "@(Url.Action("Delete", "UserField", new { area = Constants.AreaAdmin }))",
- data: postData,
- success: function (data) {
- if (data.success) {
- window.location.href = window.location.href;
- }
- else
- alert(data.errors);
- },
- error: function (xhr, ajaxOptions, thrownError) {
- alert('Failed to add.');
- }
- });
- }
- };
- </script>
}
- @if (permission)
- {
- <div class="panel panel-default">
- <div class="panel-body">
- <p>
- <strong>@Loc["Admin.Common.UserFields.AddNew"]</strong>
- </p>
- <div class="form-horizontal">
- <div class="form-body">
- <div class="form-group">
- <label class="control-label col-md-3 col-sm-3">@Loc["Admin.Common.UserFields.Fields.Key"]</label>
- <div class="col-md-9 col-sm-9">
- <input class="form-control k-input text-box single-line valid" id="ga_key" name="ga_key" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-md-3 col-sm-3">@Loc["Admin.Common.UserFields.Fields.Value"]</label>
- <div class="col-md-9 col-sm-9">
- <input class="form-control k-input text-box single-line valid" id="ga_value" name="ga_value" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-md-3 col-sm-3">@Loc["Admin.Common.UserFields.Fields.Store"]</label>
- <div class="col-md-9 col-sm-9">
- @Html.DropDownList("ga_store", stores, new { @class = "form-control" })
- </div>
- </div>
+</div>
+
+<script id="template" type="text/html">
+ <div id="UserFieldsItem_${id}" class="form-body">
+ <div class="form-group">
+ <label class="control-label col-md-3 col-sm-3">${key}</label>
+ <div class="col-md-6 col-sm-6">
+ <input class="form-control k-input text-box single-line valid"
+ id="UserFields_${id}__Value" name="UserFields[${id}].Value" type="text" value="${value}">
+ <input type="hidden" id="UserFields_${id}__Key" name="UserFields[${id}].Key" value="${key}">
+ </div>
+ <div class="col-md-3 col-sm-3 input-group custom-input-group">
+ <select id="UserFields_{id}__StoreId" name="UserFields[${id}].StoreId" class="form-control k-input valid">
+ @foreach (var store in stores)
+ {
+ <option value="@store.Value">@store.Text</option>
+ }
+ </select>
+ <span class="input-group-addon btn red deleteuserfield" data-id="${id}" onclick="deleteUserFields(${id})"><i class="fa fa fa-times"></i></span>
+ </div>
+ </div>
+ </div>
+</script>
+
+<div class="panel panel-default">
+ <div class="panel-body">
+ <p>
+ <strong>@Loc["Admin.Common.UserFields.AddNew"]</strong>
+ </p>
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <label class="control-label col-md-3 col-sm-3">@Loc["Admin.Common.UserFields.Fields.Key"]</label>
+ <div class="col-md-9 col-sm-9">
+ <input class="form-control k-input text-box single-line valid" id="ga_key" name="ga_key" type="text" value="">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-md-3 col-sm-3">@Loc["Admin.Common.UserFields.Fields.Value"]</label>
+ <div class="col-md-9 col-sm-9">
+ <input class="form-control k-input text-box single-line valid" id="ga_value" name="ga_value" type="text" value="">
</div>
</div>
- </div>
- <div class="panel-footer">
- <button type="button" id="addUserField" class="k-primary k-button"><i class="fa fa-plus"></i>@Loc["Admin.Common.UserFields.AddNew.Button"]</button>
</div>
</div>
- <script>
- $(document).ready(function () {
+ </div>
+ <div class="panel-footer">
+ <button type="button" id="addUserField" onclick="addUserFields()" class="k-primary k-button"><i class="fa fa-plus"></i>@Loc["Admin.Common.UserFields.AddNew.Button"]</button>
+ </div>
+</div>
+<script>
+ var counter = @userFields.Count;
- $('#addUserField').click(function () {
- var attrKey = $("#ga_key").val();
- var attrValue = $("#ga_value").val();
- var attrStore = $("#ga_store").val();
- //some validation
- if (attrKey === "") {
- alert('@Loc["Admin.Common.UserFields.Fields.Key.Required"]');
- return;
- }
- if (attrValue === "") {
- alert('@Loc["Admin.Common.UserFields.Fields.Value.Required"]');
- return;
- }
- var postData = {
- Key: attrKey,
- Value: attrValue,
- StoreId: attrStore,
- ObjectType: "@ViewData["ObjectType"]",
- SelectedTab: '@ViewData["TabIndex"]',
- Id: '@Model.Id',
- };
- addAntiForgeryToken(postData);
+ function addUserFields()
+ {
+ const attrKey = $("#ga_key").val();
+ const attrValue = $("#ga_value").val();
- $.ajax({
- cache: false,
- type: "POST",
- url: "@(Url.Action("Add", "UserField", new { area = Constants.AreaAdmin }))",
- data: postData,
- success: function (data) {
- if (data.success) {
- window.location.href = window.location.href;
- }
- else
- alert(data.errors);
- },
- error: function (xhr, ajaxOptions, thrownError) {
- alert('Failed to add.');
- }
- });
- });
- });
- </script>
- <vc:admin-widget widget-zone="userfield_details_info_bottom" additional-data="Model" />
+ //some validation
+ if (attrKey === "") {
+ alert('@Loc["Admin.Common.UserFields.Fields.Key.Required"]');
+ return;
+ }
+ if (attrValue === "") {
+ alert('@Loc["Admin.Common.UserFields.Fields.Value.Required"]');
+ return;
+ }
+ const data = { key: attrKey, value: attrValue, id: counter };
+ $("#template").tmpl(data).appendTo("#form-userfield");
+ counter = counter + 1;
}
-}
-else
-{
- <vc:admin-widget widget-zone="userfield_details_info_savebefore" additional-data="Model" />
- <div class="note note-info">
- @Loc["Admin.Common.UserFields.SaveBeforeEdit"]
- </div>
-}
+
+ function deleteUserFields(id) {
+ // remove record
+ document.getElementById('UserFieldsItem_' + id).remove();
+ counter = counter - 1;
+ // update records
+ const records = document.querySelectorAll('#form-userfield .form-body');
+ records.forEach(function (element, id) {
+ const input_val = element.querySelector('input[type="text"]');
+ const input_key = element.querySelector('input[type="hidden"]');
+ const input_del = element.querySelector('.deleteuserfield');
+ const select = element.querySelector('select');
+
+ input_del.setAttribute('data-id', id);
+ input_del.setAttribute('onclick', 'deleteUserFields('+id+')');
+
+ element.id = 'UserFieldsItem_' + id;
+
+ input_val.id = 'UserFields_' + id + '__Value';
+ input_val.setAttribute('name', 'UserFields[' + id + '].Value');
+
+ input_key.id = 'UserFields_' + id + '__Key';
+ input_key.setAttribute('name', 'UserFields[' + id + '].Key');
+
+ select.id = 'UserFields_' + id + '__StoreId';
+ select.setAttribute('name', 'UserFields[' + id + '].StoreId');
+
+
+ select.setAttribute('name', 'UserFields[' + id + '].StoreId');
+ });
+ }
+</script>
+<vc:admin-widget widget-zone="userfield_details_info_bottom" additional-data="Model" />
+
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
index 122485065..4f530fabb 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
@@ -4,8 +4,6 @@
//page title
ViewBag.Title = Loc["Admin.Orders.Shipments.ViewDetails"];
var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
- var canManageUserFields = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageUserFields);
-
}
<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="ShipmentDetails" method="post">
<input type="hidden" asp-for="Id" />
@@ -99,25 +97,18 @@
</div>
</content>
</tabstrip-item>
- @if (canManageUserFields)
- {
- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">
- <content>
- <div>
- <div class="form-actions">
- <input type="submit" asp-action="EditUserFields" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" class="k-button" />
- </div>
- <div class="form-horizontal">
- @{
- ViewData["ObjectType"] = "Shipment";
- ViewData["TabIndex"] = 3;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
- </div>
+ <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">
+ <content>
+ <div>
+ <div class="form-actions">
+ <input type="submit" asp-action="EditUserFields" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" class="k-button" />
</div>
- </content>
- </tabstrip-item>
- }
+ <div class="form-horizontal">
+ <partial name="_UserFields" model="Model" />
+ </div>
+ </div>
+ </content>
+ </tabstrip-item>
<vc:admin-widget widget-zone="shipment_details_tabs" additional-data="Model" />
</items>
</admin-tabstrip>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/_CreateOrUpdateDeliveryDate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/_CreateOrUpdateDeliveryDate.cshtml
index b517ce5ff..4d95bc246 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/_CreateOrUpdateDeliveryDate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/_CreateOrUpdateDeliveryDate.cshtml
@@ -1,16 +1,11 @@
@model DeliveryDateModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
@using Microsoft.AspNetCore.Mvc.Razor;
-@{
- var canManageUserFields = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageUserFields);
-}
-
<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.css" />
<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.js"></script>
@{ Func<int, HelperResult>
- template = @<div class="form-body">
+ template = @<div class="form-body">
<div class="form-group">
<admin-label asp-for="@Model.Locales[item].Name" />
<div class="col-md-9 col-sm-9">
@@ -72,21 +67,14 @@
</div>
</content>
</tabstrip-item>
- @if (canManageUserFields)
- {
- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="1">
- <content>
- <div>
- <div class="form-horizontal">
- @{
- ViewData["ObjectType"] = "DeliveryDate";
- ViewData["TabIndex"] = 1;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
- </div>
+ <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="1">
+ <content>
+ <div>
+ <div class="form-horizontal">
+ <partial name="_UserFields" model="Model" />
</div>
- </content>
- </tabstrip-item>
- }
+ </div>
+ </content>
+ </tabstrip-item>
</items>
</admin-tabstrip>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.cshtml
index 5f0f9a7fc..afadeb9ab 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.cshtml
@@ -21,11 +21,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">
<content>
<div>
- @{
- ViewData["ObjectType"] = "SpecificationAttribute";
- ViewData["TabIndex"] = 2;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
index e47b400dc..1bc1f328c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
@@ -59,11 +59,7 @@
<tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="6">
<content>
<div>
- @{
- ViewData["ObjectType"] = "Vendor";
- ViewData["TabIndex"] = 6;
- }
- <partial name="_UserFields" model="Model" view-data="ViewData" />
+ <partial name="_UserFields" model="Model" />
</div>
</content>
</tabstrip-item>
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 6612cc4ec..8c34d9f35 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -631,7 +631,7 @@ namespace Grand.Web.Admin.Controllers
await _orderViewModelService.PrepareOrderDetailsModel(model, order);
//selected tab
- await SaveSelectedTabIndex(persistForTheNextRequest: false);
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
return RedirectToAction("Edit", "Order", new { id = id });
}
@@ -661,7 +661,7 @@ namespace Grand.Web.Admin.Controllers
await _orderViewModelService.PrepareOrderDetailsModel(model, order);
//selected tab
- await SaveSelectedTabIndex(persistForTheNextRequest: false);
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
return RedirectToAction("Edit", "Order", new { id = id });
}
@@ -860,7 +860,7 @@ namespace Grand.Web.Admin.Controllers
await _orderViewModelService.PrepareOrderDetailsModel(model, order);
//selected tab
- await SaveSelectedTabIndex(persistForTheNextRequest: false);
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
return RedirectToAction("Edit", "Order", new { id = id });
}
@@ -900,7 +900,7 @@ namespace Grand.Web.Admin.Controllers
await _orderViewModelService.PrepareOrderDetailsModel(model, order);
//selected tab
- await SaveSelectedTabIndex(persistForTheNextRequest: false);
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
return RedirectToAction("Edit", "Order", new { id = id });
}
diff --git a/src/Web/Grand.Web.Admin/Controllers/UserFieldController.cs b/src/Web/Grand.Web.Admin/Controllers/UserFieldController.cs
deleted file mode 100644
index 13e63018b..000000000
--- a/src/Web/Grand.Web.Admin/Controllers/UserFieldController.cs
+++ /dev/null
@@ -1,330 +0,0 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Infrastructure;
-using Grand.Infrastructure.Caching;
-using Grand.Domain.Customers;
-using Grand.Web.Common.Security.Authorization;
-using Grand.Web.Admin.Extensions;
-using Grand.Web.Admin.Models.Common;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Grand.Web.Admin.Controllers
-{
- [PermissionAuthorize(PermissionSystemName.UserFields)]
- public partial class UserFieldController : BaseAdminController
- {
- #region Fields
-
- private readonly IUserFieldService _userFieldService;
- private readonly ICacheBase _cacheBase;
- private readonly ITranslationService _translationService;
- private readonly IWorkContext _workContext;
- private readonly IServiceProvider _serviceProvider;
- private readonly IGroupService _groupService;
- private readonly IPermissionService _permissionService;
-
- #endregion
-
- #region Constructors
-
- public UserFieldController(IUserFieldService userFieldService, ICacheBase cacheBase, ITranslationService translationService,
- IWorkContext workContext, IGroupService groupService, IPermissionService permissionService, IServiceProvider serviceProvider)
- {
- _userFieldService = userFieldService;
- _cacheBase = cacheBase;
- _translationService = translationService;
- _workContext = workContext;
- _groupService = groupService;
- _permissionService = permissionService;
- _serviceProvider = serviceProvider;
- }
-
- #endregion
-
- #region Utilities
-
- protected async Task<bool> CheckPermission(string objectType, string entityId)
- {
- Enum.TryParse(objectType, out EntityType objType);
- if (objType == EntityType.Category)
- {
- return await PermissionForCategory(entityId);
- }
- if (objType == EntityType.Product)
- {
- return await PermissionForProduct(entityId);
- }
- if (objType == EntityType.Collection)
- {
- return await PermissionForCollection(entityId);
- }
- if (objType == EntityType.Course)
- {
- return await PermissionForCourse(entityId);
- }
- if (objType == EntityType.Order)
- {
- return await PermissionForOrder(entityId);
- }
- if (objType == EntityType.Customer)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageCustomers))
- return false;
- }
- if (objType == EntityType.CustomerGroup)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageCustomerGroups))
- return false;
- }
- if (objType == EntityType.Vendor)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageVendors))
- return false;
- }
- if (objType == EntityType.Shipment)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageShipments))
- return false;
- }
- if (objType == EntityType.MerchandiseReturn)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageMerchandiseReturns))
- return false;
- }
- if (objType == EntityType.Page)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManagePages))
- return false;
- }
- if (objType == EntityType.BlogPost)
- {
- return await PermissionForBlog(entityId);
- }
- return true;
- }
- protected async Task<bool> PermissionForCategory(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageCategories))
- return false;
-
- var categoryService = _serviceProvider.GetRequiredService<ICategoryService>();
- var category = await categoryService.GetCategoryById(id);
- if (category != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (!category.LimitedToStores || (category.LimitedToStores && category.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && category.Stores.Count > 1))
- return false;
- else
- {
- if (!category.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))
- return false;
- }
- }
- return true;
- }
- return false;
- }
- protected async Task<bool> PermissionForProduct(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageProducts))
- return false;
-
- var productService = _serviceProvider.GetRequiredService<IProductService>();
- var product = await productService.GetProductById(id);
- if (product != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (!product.LimitedToStores || (product.LimitedToStores && product.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && product.Stores.Count > 1))
- return false;
- else
- {
- if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))
- return false;
- }
- }
- if (_workContext.CurrentVendor != null)
- {
- if (product.VendorId != _workContext.CurrentVendor.Id)
- return false;
- }
- return true;
- }
- return false;
- }
- protected async Task<bool> PermissionForCollection(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageCollections))
- return false;
-
- var collectionService = _serviceProvider.GetRequiredService<ICollectionService>();
- var collection = await collectionService.GetCollectionById(id);
- if (collection != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (!collection.LimitedToStores || (collection.LimitedToStores && collection.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && collection.Stores.Count > 1))
- return false;
- else
- {
- if (!collection.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))
- return false;
- }
- }
- return true;
- }
- return false;
- }
- protected async Task<bool> PermissionForCourse(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageCourses))
- return false;
-
- var courseService = _serviceProvider.GetRequiredService<ICourseService>();
- var course = await courseService.GetById(id);
- if (course != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (!course.LimitedToStores || (course.LimitedToStores && course.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && course.Stores.Count > 1))
- return false;
- else
- {
- if (!course.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))
- return false;
- }
- }
- return true;
- }
- return false;
- }
- protected async Task<bool> PermissionForOrder(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageOrders))
- return false;
-
- var orderService = _serviceProvider.GetRequiredService<IOrderService>();
- var order = await orderService.GetOrderById(id);
- if (order != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (order.StoreId != _workContext.CurrentCustomer.StaffStoreId)
- return false;
- }
- if (_workContext.CurrentVendor != null)
- {
- return false;
- }
- return true;
- }
- return false;
- }
- protected async Task<bool> PermissionForBlog(string id)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageBlog))
- return false;
-
- var blogService = _serviceProvider.GetRequiredService<IBlogService>();
- var blog = await blogService.GetBlogPostById(id);
- if (blog != null)
- {
- if (await _groupService.IsStaff(_workContext.CurrentCustomer))
- {
- if (!blog.LimitedToStores || (blog.LimitedToStores && blog.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && blog.Stores.Count > 1))
- return false;
- else
- {
- if (!blog.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- #endregion
-
-
- #region Methods
-
- [HttpPost]
- public async Task<IActionResult> Add(UserFieldModel model)
- {
- if (!await CheckPermission(model.ObjectType, model.Id))
- {
- ModelState.AddModelError("", _translationService.GetResource("Admin.Common.UserFields.Permission"));
- }
-
- if (ModelState.IsValid)
- {
- if (model.SelectedTab > 0)
- TempData["Grand.selected-tab-index"] = model.SelectedTab;
-
- await _userFieldService.SaveField(model.ObjectType, model.Id, model.Key, model.Value, model.StoreId);
-
- //TO DO - temporary solution
- //After add new attribute we need clear cache
- await _cacheBase.Clear();
-
- return Json(new
- {
- success = true,
- });
- }
- return Json(new
- {
- success = false,
- errors = ModelState.Keys.SelectMany(k => ModelState[k].Errors)
- .Select(m => m.ErrorMessage).ToArray()
- });
- }
-
- [HttpPost]
- public async Task<IActionResult> Delete(UserFieldModel model)
- {
- if (!await CheckPermission(model.ObjectType, model.Id))
- {
- ModelState.AddModelError("", _translationService.GetResource("Admin.Common.UserFields.Permission"));
- }
-
- if (ModelState.IsValid)
- {
- if (model.SelectedTab > 0)
- TempData["Grand.selected-tab-index"] = model.SelectedTab;
-
- await _userFieldService.SaveField(model.ObjectType, model.Id, model.Key, string.Empty, model.StoreId);
- //TO DO - temporary solution
- //After delete attribute we need clear cache
- await _cacheBase.Clear();
- return Json(new
- {
- success = true,
- });
- }
- return Json(new
- {
- success = false,
- errors = ModelState.Keys.SelectMany(k => ModelState[k].Errors)
- .Select(m => m.ErrorMessage).ToArray()
- });
- }
-
- #endregion
-
- }
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index db6ffe24c..2668ca688 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -7,6 +7,7 @@ using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
+using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearchers;
using Grand.SharedKernel.Extensions;