Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ambiguity in LocalizedTaxonomyController action names #8785

Merged
merged 10 commits into from
May 16, 2024
Merged

Ambiguity in LocalizedTaxonomyController action names #8785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
794f4c0
Removed ambiguity to LocalizedTaxonomyController actions.
AndreaPiovanelli Apr 15, 2024
fbff870
Properly added ApplyPreRequest to the action.
AndreaPiovanelli Apr 15, 2024
6be31b9
Code refactoring
AndreaPiovanelli Apr 17, 2024
2f6ada4
Code autoformatting
AndreaPiovanelli Apr 17, 2024
e8dc12b
Sorting using
AndreaPiovanelli May 16, 2024
d963e08
Overriding GetTaxonomy action
AndreaPiovanelli May 16, 2024
cfca5d1
Calling base GetTaxonomy action
AndreaPiovanelli May 16, 2024
cb443fa
Removing ApplyPreRequest function
AndreaPiovanelli May 16, 2024
9b96ffc
Removed ApplyPreRequest function
AndreaPiovanelli May 16, 2024
8b04c3d
Added virtual keyword to GetTaxonomy action in LocalizedTaxonomyContr…
AndreaPiovanelli May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/AdminLocalizedTaxonomyController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Web.Mvc;
using System.Web.Routing;
using System.Web.Routing;
using Orchard.ContentManagement.MetaData;
using Orchard.Environment.Extensions;
using Orchard.Localization.Services;
Expand All @@ -25,10 +25,9 @@ public AdminLocalizedTaxonomyController(IContentDefinitionManager contentDefinit
}

[OutputCache(NoStore = true, Duration = 0)]
public new ActionResult GetTaxonomy(string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
public override ActionResult GetTaxonomy(string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
AdminFilter.Apply(_requestContext);
AndreaPiovanelli marked this conversation as resolved.
Show resolved Hide resolved

return GetTaxonomyInternal(contentTypeName, taxonomyFieldName, contentId, culture, selectedValues);
return base.GetTaxonomy(contentTypeName, taxonomyFieldName, contentId, culture, selectedValues);
}
}
}
}
4 changes: 2 additions & 2 deletions src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/LocalizedTaxonomyController.cs
View file
Open in desktop
AndreaPiovanelli marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public LocalizedTaxonomyController(
}

[OutputCache(NoStore = true, Duration = 0)]
public ActionResult GetTaxonomy(string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
public virtual ActionResult GetTaxonomy(string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
return GetTaxonomyInternal(contentTypeName, taxonomyFieldName, contentId, culture, selectedValues);
}

protected ActionResult GetTaxonomyInternal (string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
protected ActionResult GetTaxonomyInternal(string contentTypeName, string taxonomyFieldName, int contentId, string culture, string selectedValues) {
var viewModel = new TaxonomyFieldViewModel();
bool autocomplete = false;
var contentDefinition = _contentDefinitionManager.GetTypeDefinition(contentTypeName);
Expand Down