lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-08-01 18:45:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x

Browse Source 
Ordered layers alphabetically in Widget admin UI.
This commit is contained in:
Sébastien Ros 2015-08-06 12:41:19 -07:00
commit b206a656e8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
View File

@ -61,7 +61,7 @@ namespace Orchard.Widgets.Controllers {
return RedirectToAction("Index", "Admin", new { area = "Dashboard" });
}
IEnumerable<LayerPart> layers = _widgetsService.GetLayers().ToList();
IEnumerable<LayerPart> layers = _widgetsService.GetLayers().OrderBy(x => x.Name).ToList();
if (!layers.Any()) {
Services.Notifier.Error(T("There are no widget layers defined. A layer will need to be added in order to add widgets to any part of the site."));
@ -87,10 +87,10 @@ namespace Orchard.Widgets.Controllers {
if (!String.IsNullOrWhiteSpace(culture)) {
widgets = widgets.Where(x => {
if(x.Has<ILocalizableAspect>()) {
if (x.Has<ILocalizableAspect>()) {
return String.Equals(x.As<ILocalizableAspect>().Culture, culture, StringComparison.InvariantCultureIgnoreCase);
}
return false;
}).ToList();
}
@ -142,7 +142,7 @@ namespace Orchard.Widgets.Controllers {
return RedirectToAction("Index");
}
IEnumerable<LayerPart> layers = _widgetsService.GetLayers().ToList();
IEnumerable<LayerPart> layers = _widgetsService.GetLayers().OrderBy(x => x.Name).ToList();
if (!layers.Any()) {
Services.Notifier.Error(T("Layer not found: {0}", layerId));
@ -315,7 +315,8 @@ namespace Orchard.Widgets.Controllers {
try {
_widgetsService.DeleteLayer(id);
Services.Notifier.Information(T("Layer was successfully deleted"));
} catch (Exception exception) {
}
catch (Exception exception) {
Logger.Error(T("Removing Layer failed: {0}", exception.Message).Text);
Services.Notifier.Error(T("Removing Layer failed: {0}", exception.Message));
}