# Conflicts: # .github/README.md # build.bat # src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs # src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs # src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs # src/Umbraco.Core/Persistence/Factories/MediaFactory.cs # src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs # src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs # src/Umbraco.Core/Persistence/Repositories/UserRepository.cs # src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs # src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs # src/Umbraco.Core/Services/EntityService.cs # src/Umbraco.Core/Services/IMediaService.cs # src/Umbraco.Core/Services/MediaService.cs # src/Umbraco.Core/Services/NotificationService.cs # src/Umbraco.Web.UI.Client/bower.json # src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js # src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js # src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js # src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js # src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js # src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js # src/Umbraco.Web.UI.Client/src/less/main.less # src/Umbraco.Web.UI.Client/src/less/panel.less # src/Umbraco.Web.UI.Client/src/less/property-editors.less # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js # src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html # src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html # src/Umbraco.Web.UI.Client/src/views/content/copy.html # src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html # src/Umbraco.Web.UI.Client/src/views/content/move.html # src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html # src/Umbraco.Web.UI.Client/src/views/datatypes/move.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js # src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html # src/Umbraco.Web.UI.Client/src/views/media/move.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html # src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html # src/Umbraco.Web.UI/Umbraco/config/lang/da.xml # src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml # src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml # src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml # src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml # src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml # src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml # src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx # src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/umbraco/config/lang/es.xml # src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx # src/Umbraco.Web/Controllers/UmbLoginController.cs # src/Umbraco.Web/Editors/ContentControllerBase.cs # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/Editors/MediaController.cs # src/Umbraco.Web/Editors/PasswordChanger.cs # src/Umbraco.Web/HttpRequestExtensions.cs # src/Umbraco.Web/Models/ContentEditing/Tab.cs # src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs # src/Umbraco.Web/Templates/TemplateRenderer.cs # src/Umbraco.Web/Trees/ApplicationTreeController.cs # src/Umbraco.Web/Trees/ContentTreeController.cs # src/Umbraco.Web/Trees/ContentTreeControllerBase.cs # src/Umbraco.Web/Trees/MediaTreeController.cs # src/Umbraco.Web/_Legacy/Controls/TabView.cs # src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs # src/umbraco.cms/Actions/Action.cs # src/umbraco.providers/members/UmbracoMembershipProvider.cs
164 lines
6.9 KiB
C#
164 lines
6.9 KiB
C#
using System;
|
|
using System.Linq;
|
|
using System.Net;
|
|
using System.Net.Http;
|
|
using System.Web.Http;
|
|
using Umbraco.Core;
|
|
using Umbraco.Core.Logging;
|
|
using Umbraco.Core.Models;
|
|
using Umbraco.Core.Models.Editors;
|
|
using Umbraco.Core.PropertyEditors;
|
|
using Umbraco.Core.Services;
|
|
using Umbraco.Web.Composing;
|
|
using Umbraco.Web.Models.ContentEditing;
|
|
using Umbraco.Web.WebApi;
|
|
using Umbraco.Web.WebApi.Filters;
|
|
|
|
|
|
namespace Umbraco.Web.Editors
|
|
{
|
|
/// <summary>
|
|
/// An abstract base controller used for media/content/members to try to reduce code replication.
|
|
/// </summary>
|
|
[OutgoingDateTimeFormat]
|
|
public abstract class ContentControllerBase : BackOfficeNotificationsController
|
|
{
|
|
protected HttpResponseMessage HandleContentNotFound(object id, bool throwException = true)
|
|
{
|
|
ModelState.AddModelError("id", $"content with id: {id} was not found");
|
|
var errorResponse = Request.CreateErrorResponse(
|
|
HttpStatusCode.NotFound,
|
|
ModelState);
|
|
if (throwException)
|
|
{
|
|
throw new HttpResponseException(errorResponse);
|
|
}
|
|
return errorResponse;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps the dto property values to the persisted model
|
|
/// </summary>
|
|
/// <typeparam name="TPersisted"></typeparam>
|
|
/// <typeparam name="TSaved"></typeparam>
|
|
/// <param name="contentItem"></param>
|
|
/// <param name="dto"></param>
|
|
/// <param name="getPropertyValue"></param>
|
|
/// <param name="savePropertyValue"></param>
|
|
internal void MapPropertyValuesForPersistence<TPersisted, TSaved>(
|
|
TSaved contentItem,
|
|
ContentPropertyCollectionDto dto,
|
|
Func<TSaved, Property, object> getPropertyValue,
|
|
Action<TSaved, Property, object> savePropertyValue)
|
|
where TPersisted : IContentBase
|
|
where TSaved : IContentSave<TPersisted>
|
|
{
|
|
// map the property values
|
|
foreach (var propertyDto in dto.Properties)
|
|
{
|
|
// get the property editor
|
|
if (propertyDto.PropertyEditor == null)
|
|
{
|
|
Logger.Warn<ContentController>("No property editor found for property {PropertyAlias}", propertyDto.Alias);
|
|
continue;
|
|
}
|
|
|
|
// get the value editor
|
|
// nothing to save/map if it is readonly
|
|
var valueEditor = propertyDto.PropertyEditor.GetValueEditor();
|
|
if (valueEditor.IsReadOnly) continue;
|
|
|
|
// get the property
|
|
var property = contentItem.PersistedContent.Properties[propertyDto.Alias];
|
|
|
|
// prepare files, if any matching property and culture
|
|
var files = contentItem.UploadedFiles
|
|
.Where(x => x.PropertyAlias == propertyDto.Alias && x.Culture == propertyDto.Culture)
|
|
.ToArray();
|
|
|
|
foreach (var file in files)
|
|
file.FileName = file.FileName.ToSafeFileName();
|
|
|
|
// create the property data for the property editor
|
|
var data = new ContentPropertyData(propertyDto.Value, propertyDto.DataType.Configuration)
|
|
{
|
|
ContentKey = contentItem.PersistedContent.Key,
|
|
PropertyTypeKey = property.PropertyType.Key,
|
|
Files = files
|
|
};
|
|
|
|
// let the editor convert the value that was received, deal with files, etc
|
|
var value = valueEditor.FromEditor(data, getPropertyValue(contentItem, property));
|
|
|
|
// set the value - tags are special
|
|
var tagAttribute = propertyDto.PropertyEditor.GetTagAttribute();
|
|
if (tagAttribute != null)
|
|
{
|
|
var tagConfiguration = ConfigurationEditor.ConfigurationAs<TagConfiguration>(propertyDto.DataType.Configuration);
|
|
if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = tagAttribute.Delimiter;
|
|
//fixme how is this supposed to work with variants?
|
|
property.SetTagsValue(value, tagConfiguration);
|
|
}
|
|
else
|
|
savePropertyValue(contentItem, property, value);
|
|
}
|
|
}
|
|
|
|
protected virtual void HandleInvalidModelState(IErrorModel display)
|
|
{
|
|
//lastly, if it is not valid, add the modelstate to the outgoing object and throw a 403
|
|
if (!ModelState.IsValid)
|
|
{
|
|
display.Errors = ModelState.ToErrorDictionary();
|
|
throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// A helper method to attempt to get the instance from the request storage if it can be found there,
|
|
/// otherwise gets it from the callback specified
|
|
/// </summary>
|
|
/// <typeparam name="TPersisted"></typeparam>
|
|
/// <param name="getFromService"></param>
|
|
/// <returns></returns>
|
|
/// <remarks>
|
|
/// This is useful for when filters have alraedy looked up a persisted entity and we don't want to have
|
|
/// to look it up again.
|
|
/// </remarks>
|
|
protected TPersisted GetObjectFromRequest<TPersisted>(Func<TPersisted> getFromService)
|
|
{
|
|
//checks if the request contains the key and the item is not null, if that is the case, return it from the request, otherwise return
|
|
// it from the callback
|
|
return Request.Properties.ContainsKey(typeof(TPersisted).ToString()) && Request.Properties[typeof(TPersisted).ToString()] != null
|
|
? (TPersisted) Request.Properties[typeof (TPersisted).ToString()]
|
|
: getFromService();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if the action passed in means we need to create something new
|
|
/// </summary>
|
|
/// <param name="action"></param>
|
|
/// <returns></returns>
|
|
internal static bool IsCreatingAction(ContentSaveAction action)
|
|
{
|
|
return (action.ToString().EndsWith("New"));
|
|
}
|
|
|
|
protected void AddCancelMessage(INotificationModel display,
|
|
string header = "speechBubbles/operationCancelledHeader",
|
|
string message = "speechBubbles/operationCancelledText",
|
|
bool localizeHeader = true,
|
|
bool localizeMessage = true)
|
|
{
|
|
//if there's already a default event message, don't add our default one
|
|
//fixme inject
|
|
var msgs = Current.EventMessages;
|
|
if (msgs != null && msgs.GetAll().Any(x => x.IsDefaultEventMessage)) return;
|
|
|
|
display.AddWarningNotification(
|
|
localizeHeader ? Services.TextService.Localize(header) : header,
|
|
localizeMessage ? Services.TextService.Localize(message): message);
|
|
}
|
|
}
|
|
}
|