lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

filterTaxonomyCulture function is now named with a proper unique name, based on part and field (#8702)

Browse Source 
* Checked back previously selected terms after replacing the TaxonomyField markup.

* Checkbox reset before checking back selected items.

* Javascript functions to refresh localized terms are now named to be unique. For this purpose, added PartName property to LocalizedTaxonomiesViewModel.

* Code refactoring: added variables for part-field differentiator and function name.
This commit is contained in:
Andrea Piovanelli
2023-06-19 10:02:08 +02:00
committed by GitHub
parent 2ef2ad8e99
commit 0485e44378
3 changed files with 89 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/LocalizedTaxonomyFieldDriver.cs
View File

@@ -35,7 +35,8 @@ namespace Orchard.Taxonomies.Drivers {
ContentType = part.ContentItem.ContentType, ContentType = part.ContentItem.ContentType,
FieldName = field.Name, FieldName = field.Name,
Id = part.ContentItem.Id, Id = part.ContentItem.Id,
Setting = taxonomySettings Setting = taxonomySettings,
PartName = part.PartDefinition.Name
}; };
return shapeHelper.EditorTemplate(TemplateName: templateName, Model: viewModel, Prefix: GetPrefix(field, part)); return shapeHelper.EditorTemplate(TemplateName: templateName, Model: viewModel, Prefix: GetPrefix(field, part));
}); });

1
src/Orchard.Web/Modules/Orchard.Taxonomies/ViewModels/LocalizedTaxonomiesViewModel.cs
View File

@@ -7,6 +7,7 @@ namespace Orchard.Taxonomies.ViewModels {
public string ContentType { get; set; } public string ContentType { get; set; }
public string FieldName { get; set; } public string FieldName { get; set; }
public int Id { get; set; } public int Id { get; set; }
public string PartName { get; set; }
public TaxonomyFieldSettings Setting { get; set; } public TaxonomyFieldSettings Setting { get; set; }
} }
} }

23
src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyFieldList.cshtml
View File

@@ -4,17 +4,24 @@
@{ @{
Script.Require("jQuery"); Script.Require("jQuery");
var Taxonomyprefix = ((ViewData)).TemplateInfo.HtmlFieldPrefix.Replace('.', '_'); var Taxonomyprefix = ((ViewData)).TemplateInfo.HtmlFieldPrefix.Replace('.', '_');
var partField = Model.PartName + "_" + Model.FieldName;
var functionName = "filterTaxonomyCulture_" + partField;
using (Script.Foot()) { using (Script.Foot()) {
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$(document).ready(function () { $(document).ready(function () {
var pageurl = '@Url.Action("GetTaxonomy", "LocalizedTaxonomy", new { area = "Orchard.Taxonomies" })'; var pageurl = '@Url.Action("GetTaxonomy", "LocalizedTaxonomy", new { area = "Orchard.Taxonomies" })';
function filterTaxonomyCulture(culture) { function @(functionName)(culture) {
$.ajax({ $.ajax({
url: pageurl, url: pageurl,
data: { contentTypeName: '@Model.ContentType', taxonomyFieldName: '@Model.FieldName', contentId: @Model.Id, culture: culture }, data: { contentTypeName: '@Model.ContentType', taxonomyFieldName: '@Model.FieldName', contentId: @Model.Id, culture: culture },
success: function (html) { success: function (html) {
var container = $(".taxonomy-wrapper[data-id-prefix='@Taxonomyprefix']");
$(".taxonomy-wrapper[data-id-prefix='@Taxonomyprefix']").replaceWith(html); $(".taxonomy-wrapper[data-id-prefix='@Taxonomyprefix']").replaceWith(html);
$(".taxonomy-wrapper[data-id-prefix='@Taxonomyprefix'] legend").expandoControl(function (controller) { return controller.nextAll(".expando"); }, { collapse: true, remember: false }); $(".taxonomy-wrapper[data-id-prefix='@Taxonomyprefix'] legend").expandoControl(function (controller) { return controller.nextAll(".expando"); }, { collapse: true, remember: false });
@if (Model.Setting.Autocomplete) { @if (Model.Setting.Autocomplete) {
<text> <text>
@@ -136,11 +143,19 @@
alert("@T("Loading taxonomy fail, Retry")"); alert("@T("Loading taxonomy fail, Retry")");
}); });
} }
$("#Localization_SelectedCulture").on('change', function () { $("#Localization_SelectedCulture").on('change', function (p) {
var optionSelected = $("option:selected", this); var optionSelected = $("option:selected", this);
filterTaxonomyCulture($("#Localization_SelectedCulture").val()); var refreshTerms = false;
if (p != undefined) {
if (p == "@(partField)") {
refreshTerms = true;
}
}
if (refreshTerms) {
@(functionName)($("#Localization_SelectedCulture").val());
}
}); });
$("#Localization_SelectedCulture").trigger("change"); $("#Localization_SelectedCulture").trigger("change", "@(partField)");
}); });
//]]> //]]>
</script> </script>