From 9522ee826f06752ae5f84b344a7fd07ac058635b Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 21 Jan 2019 15:57:48 +0100 Subject: [PATCH] Deal with fixme in Umbraco.Web --- .../Cache/ContentCacheRefresher.cs | 4 ++-- .../Cache/DataTypeCacheRefresher.cs | 2 +- .../Cache/DistributedCacheBinder.cs | 2 +- .../Cache/DistributedCacheBinder_Handlers.cs | 10 ++++---- .../Cache/LanguageCacheRefresher.cs | 2 +- src/Umbraco.Web/Composing/Current.cs | 2 +- .../Controllers/UmbLoginController.cs | 7 ++---- .../Controllers/UmbLoginStatusController.cs | 10 ++++---- .../Controllers/UmbProfileController.cs | 10 ++++---- .../Controllers/UmbRegisterController.cs | 10 ++++---- .../Editors/BackOfficeServerVariables.cs | 4 ++-- src/Umbraco.Web/Editors/ContentController.cs | 11 +++------ .../Editors/ContentControllerBase.cs | 2 +- .../Editors/DataTypeValidateAttribute.cs | 2 +- src/Umbraco.Web/Editors/EditorValidator.cs | 2 +- src/Umbraco.Web/Editors/EntityController.cs | 4 +--- .../Filters/UserGroupValidateAttribute.cs | 2 +- .../Editors/KeepAliveController.cs | 2 +- src/Umbraco.Web/Editors/MemberController.cs | 2 +- .../Editors/NuCacheStatusController.cs | 1 - src/Umbraco.Web/Editors/PreviewController.cs | 7 ------ .../Editors/TemplateQueryController.cs | 3 +-- src/Umbraco.Web/Editors/UsersController.cs | 2 +- .../HealthCheck/HealthCheckResults.cs | 2 +- .../Install/InstallStepCollection.cs | 2 +- .../InstallSteps/StarterKitCleanupStep.cs | 2 +- .../Install/InstallSteps/UpgradeStep.cs | 4 ++-- .../Install/Models/InstallPackageModel.cs | 2 +- src/Umbraco.Web/Logging/WebProfiler.cs | 2 +- .../Mapping/ContentItemDisplayNameResolver.cs | 23 ------------------- .../ContentPropertyDisplayConverter.cs | 2 +- .../Mapping/ContentTypeProfileExtensions.cs | 4 ++-- .../Models/Mapping/DatabaseTypeResolver.cs | 2 +- .../Models/Mapping/EntityMapperProfile.cs | 2 +- .../Models/Mapping/MacroMapperProfile.cs | 2 +- .../MemberTabsAndPropertiesResolver.cs | 2 +- .../PublishedValueFallback.cs | 2 +- .../Models/PublishedContentBase.cs | 8 +++---- src/Umbraco.Web/Models/PublishedProperty.cs | 2 +- src/Umbraco.Web/Mvc/RenderMvcController.cs | 1 - src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 2 +- src/Umbraco.Web/Mvc/SurfaceController.cs | 7 ++---- src/Umbraco.Web/Mvc/UmbracoController.cs | 8 ------- .../Mvc/UmbracoViewPageOfTModel.cs | 2 +- src/Umbraco.Web/Properties/AssemblyInfo.cs | 4 ---- .../PropertyEditors/GridConfiguration.cs | 4 ++-- .../ImageCropperPropertyEditor.cs | 2 +- .../ImageCropperPropertyValueEditor.cs | 2 +- .../PropertyEditors/ListViewConfiguration.cs | 6 ++--- .../MacroContainerPropertyEditor.cs | 2 +- .../MultipleTextStringConfigurationEditor.cs | 4 ++-- .../NestedContentPropertyEditor.cs | 2 -- .../PropertyEditors/RichTextConfiguration.cs | 2 +- .../PropertyEditors/TrueFalseConfiguration.cs | 2 +- .../PublishedCache/IPublishedCache.cs | 2 +- .../PublishedCache/NuCache/ContentCache.cs | 2 +- .../PublishedCache/NuCache/ContentNode.cs | 2 +- .../PublishedCache/NuCache/ContentStore.cs | 4 ++-- ....DictionaryOfCultureVariationSerializer.cs | 2 +- .../NuCache/DataSource/DatabaseDataSource.cs | 2 +- .../NuCache/DataSource/PropertyData.cs | 4 ++-- src/Umbraco.Web/Umbraco.Web.csproj | 1 - .../PackageActions/publishRootDocument.cs | 2 +- 63 files changed, 84 insertions(+), 153 deletions(-) delete mode 100644 src/Umbraco.Web/Models/Mapping/ContentItemDisplayNameResolver.cs diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs index 3f2ef1620c..a1942ed141 100644 --- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs @@ -75,7 +75,7 @@ namespace Umbraco.Web.Cache if (assignedDomains.Count > 0) { - //fixme - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, + // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the // DomainCacheRefresher? @@ -92,7 +92,7 @@ namespace Umbraco.Web.Cache // content and when the PublishedCachesService is notified of changes it does not see // the new content... - // fixme - what about this? + // todo - what about this? // should rename it, and then, this is only for Deploy, and then, ??? //if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache) // ... diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs index f3d1337403..6916b40f2d 100644 --- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs @@ -56,7 +56,7 @@ namespace Umbraco.Web.Cache _idkMap.ClearCache(payload.Id); } - // fixme - not sure I like these? + // todo - not sure I like these? TagsValueConverter.ClearCaches(); SliderValueConverter.ClearCaches(); diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs index f7171a840a..ce8267dfc8 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs @@ -71,7 +71,7 @@ namespace Umbraco.Web.Cache var handler = FindHandler(e); if (handler == null) { - // fixme - should this be fatal (ie, an exception)? + // todo - should this be fatal (ie, an exception)? var name = e.Sender.GetType().Name + "_" + e.EventName; _logger.Warn("Dropping event {EventName} because no corresponding handler was found.", name); continue; diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs index 3a3eb1b8fb..f75d8ead87 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs @@ -71,7 +71,6 @@ namespace Umbraco.Web.Cache () => DataTypeService.Saved -= DataTypeService_Saved); // bind to stylesheet events - // fixme why not in v8? Bind(() => FileService.SavedStylesheet += FileService_SavedStylesheet, () => FileService.SavedStylesheet -= FileService_SavedStylesheet); Bind(() => FileService.DeletedStylesheet += FileService_DeletedStylesheet, @@ -197,7 +196,7 @@ namespace Umbraco.Web.Cache _distributedCache.RefreshContentCache(args.Changes.ToArray()); } - // fixme our weird events handling wants this for now + // todo our weird events handling wants this for now private void ContentService_Deleted(IContentService sender, DeleteEventArgs e) { } private void ContentService_Moved(IContentService sender, MoveEventArgs e) { } private void ContentService_Trashed(IContentService sender, MoveEventArgs e) { } @@ -308,7 +307,7 @@ namespace Umbraco.Web.Cache _distributedCache.RefreshContentTypeCache(args.Changes.ToArray()); } - // fixme our weird events handling wants this for now + // todo our weird events handling wants this for now private void ContentTypeService_Saved(IContentTypeService sender, SaveEventArgs args) { } private void MediaTypeService_Saved(IMediaTypeService sender, SaveEventArgs args) { } private void MemberTypeService_Saved(IMemberTypeService sender, SaveEventArgs args) { } @@ -320,7 +319,6 @@ namespace Umbraco.Web.Cache #region UserService - // fixme STATIC?? private void UserService_UserGroupPermissionsAssigned(IUserService sender, SaveEventArgs e) { //TODO: Not sure if we need this yet depends if we start caching permissions @@ -381,7 +379,7 @@ namespace Umbraco.Web.Cache _distributedCache.RefreshTemplateCache(entity.Id); } - // fixme our weird events handling wants this for now + // todo our weird events handling wants this for now private void FileService_DeletedStylesheet(IFileService sender, DeleteEventArgs e) { } private void FileService_SavedStylesheet(IFileService sender, SaveEventArgs e) { } @@ -410,7 +408,7 @@ namespace Umbraco.Web.Cache _distributedCache.RefreshMediaCache(args.Changes.ToArray()); } - // fixme our weird events handling wants this for now + // todo our weird events handling wants this for now private void MediaService_Saved(IMediaService sender, SaveEventArgs e) { } private void MediaService_Deleted(IMediaService sender, DeleteEventArgs e) { } private void MediaService_Moved(IMediaService sender, MoveEventArgs e) { } diff --git a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs index f5fe5075eb..c5dfcfd1e7 100644 --- a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs @@ -57,7 +57,7 @@ namespace Umbraco.Web.Cache if (assignedDomains.Count > 0) { - //fixme - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, + // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the // DomainCacheRefresher? diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs index 28404148b8..bd0e3d02dc 100644 --- a/src/Umbraco.Web/Composing/Current.cs +++ b/src/Umbraco.Web/Composing/Current.cs @@ -63,7 +63,7 @@ namespace Umbraco.Web.Composing #region Temp & Special - // fixme - have to keep this until tests are refactored + // todo - have to keep this until tests are refactored // but then, it should all be managed properly in the container public static IUmbracoContextAccessor UmbracoContextAccessor { diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs index 3b6389f25a..97444dbc6a 100644 --- a/src/Umbraco.Web/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs @@ -11,15 +11,12 @@ namespace Umbraco.Web.Controllers { public class UmbLoginController : SurfaceController { - // fixme - delete? public UmbLoginController() - { - } + { } public UmbLoginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) - { - } + { } [HttpPost] [ValidateAntiForgeryToken] diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs index 02d567c2bb..fddefbe4a9 100644 --- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs +++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs @@ -13,14 +13,12 @@ namespace Umbraco.Web.Controllers [MemberAuthorize] public class UmbLoginStatusController : SurfaceController { - // fixme - delete? public UmbLoginStatusController() - { - } + { } - public UmbLoginStatusController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) - { - } + public UmbLoginStatusController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) + : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) + { } [HttpPost] [ValidateAntiForgeryToken] diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs index 6c639d4216..f22192a1cc 100644 --- a/src/Umbraco.Web/Controllers/UmbProfileController.cs +++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs @@ -14,14 +14,12 @@ namespace Umbraco.Web.Controllers [MemberAuthorize] public class UmbProfileController : SurfaceController { - // fixme - delete? public UmbProfileController() - { - } + { } - public UmbProfileController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) - { - } + public UmbProfileController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) + : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) + { } [HttpPost] [ValidateAntiForgeryToken] diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs index 8de92a8a71..66c8a8143c 100644 --- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs +++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs @@ -13,14 +13,12 @@ namespace Umbraco.Web.Controllers { public class UmbRegisterController : SurfaceController { - // fixme - delete? public UmbRegisterController() - { - } + { } - public UmbRegisterController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) - { - } + public UmbRegisterController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) + : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) + { } [HttpPost] [ValidateAntiForgeryToken] diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index e266ca01c3..40891efe9e 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -425,7 +425,7 @@ namespace Umbraco.Web.Editors /// it's resolving which is unecessary and annoying. /// private static readonly Lazy> TreeControllerTypes - = new Lazy>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // fixme inject + = new Lazy>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // todo inject /// /// Returns the server variables regarding the application state @@ -438,7 +438,7 @@ namespace Umbraco.Web.Editors // add versions - see UmbracoVersion for details & differences // the complete application version (eg "8.1.2-alpha.25") - { "version", _runtimeState.SemanticVersion.ToSemanticString() }, // fixme that's UmbracoVersion.Version! + { "version", UmbracoVersion.SemanticVersion.ToSemanticString() }, // the assembly version (eg "8.0.0") { "assemblyVersion", UmbracoVersion.AssemblyVersion.ToString() } diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 3b361fcf1e..1e48f027d4 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -94,10 +94,8 @@ namespace Umbraco.Web.Editors [FilterAllowedOutgoingContent(typeof(IEnumerable))] public IEnumerable GetByIds([FromUri]int[] ids) { - //fixme what about cultures? - var foundContent = Services.ContentService.GetByIds(ids); - return foundContent.Select(x => MapToDisplay(x)); + return foundContent.Select(MapToDisplay); } /// @@ -248,7 +246,6 @@ namespace Umbraco.Web.Editors return display; } - //fixme what about cultures? public ContentItemDisplay GetBlueprintById(int id) { var foundContent = Services.ContentService.GetBlueprintById(id); @@ -274,7 +271,7 @@ namespace Umbraco.Web.Editors content.AllowedActions = new[] { "A" }; content.IsBlueprint = true; - //fixme - exclude the content apps here + //todo - exclude the content apps here //var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" }; //var propsTab = content.Tabs.Last(); //propsTab.Properties = propsTab.Properties @@ -2021,7 +2018,7 @@ namespace Umbraco.Web.Editors case PublishResultType.FailedPublishMandatoryCultureMissing: display.AddWarningNotification( Services.TextService.Localize("publish"), - "publish/contentPublishedFailedByCulture"); // fixme properly localize, these keys are missing from lang files! + "publish/contentPublishedFailedByCulture"); break; default: throw new IndexOutOfRangeException($"PublishedResultType \"{status.Key}\" was not expected."); @@ -2080,8 +2077,6 @@ namespace Umbraco.Web.Editors var rollbackVersions = new List(); var writerIds = new HashSet(); - //Return a list of all versions of a specific content node - // fixme - cap at 50 versions for now? var versions = Services.ContentService.GetVersionsSlim(contentId, 0, 50); //Not all nodes are variants & thus culture can be null diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs index 09d91a6436..1a8820c4a0 100644 --- a/src/Umbraco.Web/Editors/ContentControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs @@ -148,7 +148,7 @@ namespace Umbraco.Web.Editors string[] messageParams = null) { //if there's already a default event message, don't add our default one - //fixme inject + //todo inject var msgs = Current.EventMessages; if (msgs != null && msgs.GetAll().Any(x => x.IsDefaultEventMessage)) return; diff --git a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs index bbb9e22082..738dd05c75 100644 --- a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Editors var editorField = configurationEditor.Fields.SingleOrDefault(x => x.Key == field.Key); if (editorField == null) continue; - // run each IValueValidator (with null valueType and dataTypeConfiguration: not relevant here) - fixme - editing + // run each IValueValidator (with null valueType and dataTypeConfiguration: not relevant here) foreach (var validator in editorField.Validators) foreach (var result in validator.Validate(field.Value, null, null)) actionContext.ModelState.AddValidationError(result, "Properties", field.Key); diff --git a/src/Umbraco.Web/Editors/EditorValidator.cs b/src/Umbraco.Web/Editors/EditorValidator.cs index 2010fae943..537ae834d3 100644 --- a/src/Umbraco.Web/Editors/EditorValidator.cs +++ b/src/Umbraco.Web/Editors/EditorValidator.cs @@ -16,7 +16,7 @@ namespace Umbraco.Web.Editors { var modelType = model.GetType(); - var validationResults = Current.EditorValidators // fixme inject + var validationResults = Current.EditorValidators // todo inject .Where(x => x.ModelType == modelType) .SelectMany(x => x.Validate(model)) .Where(x => !string.IsNullOrWhiteSpace(x.ErrorMessage) && x.MemberNames.Any()); diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index 5ff0cac765..b25f3f5af1 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -863,8 +863,6 @@ namespace Umbraco.Web.Editors } } - // fixme - need to implement GetAll for backoffice controllers - dynamics? - public IEnumerable GetAll(UmbracoEntityTypes type, string postFilter, [FromUri]IDictionary postFilterParams) { return GetResultForAll(type, postFilter, postFilterParams); @@ -959,7 +957,7 @@ namespace Umbraco.Web.Editors // if a post filter is assigned then try to execute it if (postFilter.IsNullOrWhiteSpace() == false) { - // fixme - trouble is, we've killed the dynamic Where thing! + // fixme/task/critical - trouble is, we've killed the dynamic Where thing! throw new NotImplementedException("oops"); //return postFilterParams == null // ? entities.AsQueryable().Where(postFilter).ToArray() diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs index f062be1aff..3481c754d3 100644 --- a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs @@ -27,7 +27,7 @@ namespace Umbraco.Web.Editors.Filters _userService = userService; } - private IUserService UserService => _userService ?? Current.Services.UserService; // fixme inject + private IUserService UserService => _userService ?? Current.Services.UserService; // todo inject public override void OnActionExecuting(HttpActionContext actionContext) { diff --git a/src/Umbraco.Web/Editors/KeepAliveController.cs b/src/Umbraco.Web/Editors/KeepAliveController.cs index b067a5b67e..fa33abea44 100644 --- a/src/Umbraco.Web/Editors/KeepAliveController.cs +++ b/src/Umbraco.Web/Editors/KeepAliveController.cs @@ -4,7 +4,7 @@ using Umbraco.Web.WebApi; namespace Umbraco.Web.Editors { - // fixme + // fixme/task - deal with this // this is not authenticated, and therefore public, and therefore reveals we // are running Umbraco - but, all requests should come from localhost really, // so there should be a way to 404 when the request comes from the outside. diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 36027ee2a5..92ca648c3f 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -593,7 +593,7 @@ namespace Umbraco.Web.Editors { p.SetValue(valueMapped.GetValue()); - // fixme - ok, I give up, at that point tags are dead here, until we figure it out + // fixme/task - ok, I give up, at that point tags are dead here, until we figure it out //p.TagChanges.Behavior = valueMapped.TagChanges.Behavior; //p.TagChanges.Enable = valueMapped.TagChanges.Enable; //p.TagChanges.Tags = valueMapped.TagChanges.Tags; diff --git a/src/Umbraco.Web/Editors/NuCacheStatusController.cs b/src/Umbraco.Web/Editors/NuCacheStatusController.cs index b9cee665cb..fb4b54c2b2 100644 --- a/src/Umbraco.Web/Editors/NuCacheStatusController.cs +++ b/src/Umbraco.Web/Editors/NuCacheStatusController.cs @@ -32,7 +32,6 @@ namespace Umbraco.Web.Editors [HttpPost] public string RebuildDbCache() { - // fixme - should wrap in a service scope once we have them var service = PublishedSnapshotService; service.RebuildContentDbCache(); service.RebuildMediaDbCache(); diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs index 6e119d68d9..bd14a6c6f4 100644 --- a/src/Umbraco.Web/Editors/PreviewController.cs +++ b/src/Umbraco.Web/Editors/PreviewController.cs @@ -82,13 +82,6 @@ namespace Umbraco.Web.Editors return null; } - ////fixme: not sure we need this anymore since there is no canvas editing - then we can remove that route too - //public ActionResult Editors(string editor) - //{ - // if (string.IsNullOrEmpty(editor)) throw new ArgumentNullException(nameof(editor)); - // return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + editor.Replace(".html", string.Empty) + ".cshtml"); - //} - public ActionResult End(string redir = null) { var previewToken = Request.GetPreviewCookieValue(); diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs index 00e124cb29..38b60f4294 100644 --- a/src/Umbraco.Web/Editors/TemplateQueryController.cs +++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs @@ -67,7 +67,6 @@ namespace Umbraco.Web.Editors sb.Append("Model.Root()"); - //fixme: This timer thing is not correct, it's definitely not timing the resulting query, the timer really isn't important and might as well be removed var timer = new Stopwatch(); timer.Start(); @@ -160,7 +159,7 @@ namespace Umbraco.Web.Editors //trial-run the tokenized clause to time the execution //for review - this uses a tonized query rather then the normal linq query. - // fixme - that cannot work anymore now that we have killed dynamic support + // fixme/task/critical - that cannot work anymore now that we have killed dynamic support //contents = contents.AsQueryable().Where(clause, model.Filters.Select(this.GetConstraintValue).ToArray()); throw new NotImplementedException(); diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index 36a8bf1158..e7432c4828 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -208,7 +208,7 @@ namespace Umbraco.Web.Editors if (!Security.CurrentUser.IsSuper()) { - // only super can see super - but don't use IsSuper, cannot be mapped to SQL - fixme NOW + // only super can see super - but don't use IsSuper, cannot be mapped to SQL //filterQuery.Where(x => !x.IsSuper()); filterQuery.Where(x => x.Id != Constants.Security.SuperUserId); } diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs index 5962f2cabc..f8c3708e2e 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs @@ -14,7 +14,7 @@ namespace Umbraco.Web.HealthCheck private readonly Dictionary> _results; public readonly bool AllChecksSuccessful; - private ILogger Logger => Current.Logger; // fixme inject + private ILogger Logger => Current.Logger; // todo inject public HealthCheckResults(IEnumerable checks) { diff --git a/src/Umbraco.Web/Install/InstallStepCollection.cs b/src/Umbraco.Web/Install/InstallStepCollection.cs index ffbd3f10cb..d5c32d0ce6 100644 --- a/src/Umbraco.Web/Install/InstallStepCollection.cs +++ b/src/Umbraco.Web/Install/InstallStepCollection.cs @@ -14,7 +14,7 @@ namespace Umbraco.Web.Install { _installHelper = installHelper; - // fixme this is ugly but I have a branch where it's nicely refactored - for now we just want to manage ordering + // todo this is ugly but I have a branch where it's nicely refactored - for now we just want to manage ordering var a = installerSteps.ToArray(); _orderedInstallerSteps = new InstallSetupStep[] { diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs index 8c168f7230..80fda66661 100644 --- a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.Install.InstallSteps { packageFile = HttpUtility.UrlDecode(packageFile); - //fixme: When does the zip file get deleted? + //todo: When does the zip file get deleted? } public override bool RequiresExecution(object model) diff --git a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs index 5f44555092..1477105797 100644 --- a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.Install.InstallSteps { get { - // fixme - if UmbracoVersion.Local is null? + // todo- if UmbracoVersion.Local is null? // it means that there is a database but the web.config version is cleared // that was a "normal" way to force the upgrader to execute, and we would detect the current // version via the DB like DatabaseSchemaResult.DetermineInstalledVersion - magic, do we really @@ -37,7 +37,7 @@ namespace Umbraco.Web.Install.InstallSteps return value; } - var state = Current.RuntimeState; // fixme inject + var state = Current.RuntimeState; // todo inject var currentState = FormatGuidState(state.CurrentMigrationState); var newState = FormatGuidState(state.FinalMigrationState); diff --git a/src/Umbraco.Web/Install/Models/InstallPackageModel.cs b/src/Umbraco.Web/Install/Models/InstallPackageModel.cs index 3ab74fa5e4..10335c48fc 100644 --- a/src/Umbraco.Web/Install/Models/InstallPackageModel.cs +++ b/src/Umbraco.Web/Install/Models/InstallPackageModel.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Umbraco.Web.Install.Models { - //fixme: do we need this? + //todo : do we need this? [Obsolete("This is only used for the obsolete controller InstallPackageController")] [DataContract(Name = "installPackage", Namespace = "")] public class InstallPackageModel diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs index 77b57e768d..e31ef75209 100755 --- a/src/Umbraco.Web/Logging/WebProfiler.cs +++ b/src/Umbraco.Web/Logging/WebProfiler.cs @@ -47,7 +47,7 @@ namespace Umbraco.Web.Logging { // if this is the boot request, or if we should profile this request, stop // (the boot request is always profiled, no matter what) - var isBootRequest = ((HttpApplication) sender).Context.Items[BootRequestItemKey] != null; // fixme perfs + var isBootRequest = ((HttpApplication) sender).Context.Items[BootRequestItemKey] != null; if (isBootRequest) _provider.EndBootRequest(); if (isBootRequest || ShouldProfile(sender)) diff --git a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayNameResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentItemDisplayNameResolver.cs deleted file mode 100644 index 6cba6ff6ab..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayNameResolver.cs +++ /dev/null @@ -1,23 +0,0 @@ -//using AutoMapper; -//using Umbraco.Core; -//using Umbraco.Core.Models; -//using Umbraco.Web.Models.ContentEditing; -//using ContentVariation = Umbraco.Core.Models.ContentVariation; - -// fixme remove this file? -//namespace Umbraco.Web.Models.Mapping -//{ -// /// -// /// Used to map the name from an depending on it's variation settings -// /// -// internal class ContentItemDisplayNameResolver : IValueResolver -// { -// public string Resolve(IContent source, ContentVariationDisplay destination, string destMember, ResolutionContext context) -// { -// var culture = context.GetCulture(); -// return source.ContentType.VariesByCulture() && culture != null -// ? source.GetCultureName(culture) -// : source.Name; -// } -// } -//} diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs index 2f7590d6fd..3c2dd01c9c 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs @@ -29,7 +29,7 @@ namespace Umbraco.Web.Models.Mapping var config = DataTypeService.GetDataType(originalProp.PropertyType.DataTypeId).Configuration; - // fixme - IDataValueEditor configuration - general issue + // todo - IDataValueEditor configuration - general issue // GetValueEditor() returns a non-configured IDataValueEditor // - for richtext and nested, configuration determines HideLabel, so we need to configure the value editor // - could configuration also determines ValueType, everywhere? diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs index 1348dbb8a9..ba8076b457 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.Models.Mapping where TPropertyTypeBasic : PropertyTypeBasic { return mapping - .ConstructUsing(x => new PropertyGroup(false)) // fixme - we have NO idea of isPublishing here = wtf? + .ConstructUsing(x => new PropertyGroup(false)) // todo - we have NO idea of isPublishing here = wtf? .IgnoreEntityCommonProperties() .ForMember(dest => dest.Id, map => map.Condition(src => src.Id > 0)) .ForMember(dest => dest.Key, map => map.Ignore()) @@ -160,7 +160,7 @@ namespace Umbraco.Web.Models.Mapping where TDestination : IContentTypeComposition where TSourcePropertyType : PropertyTypeBasic { - // fixme not so clean really + // todo not so clean really var isPublishing = typeof(IContentType).IsAssignableFrom(typeof(TDestination)); mapping = mapping diff --git a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs index bdfc870a2f..c8fc9ea4b2 100644 --- a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs @@ -16,7 +16,7 @@ namespace Umbraco.Web.Models.Mapping if (!Current.PropertyEditors.TryGet(source.EditorAlias, out var editor)) throw new InvalidOperationException($"Could not find property editor \"{source.EditorAlias}\"."); - // fixme - what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?! + // todo - what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?! var valueType = editor.GetValueEditor().ValueType; return ValueTypes.ToStorageType(valueType); } diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs index ff7fcfc0b0..8f99fe03dc 100644 --- a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs @@ -204,7 +204,7 @@ namespace Umbraco.Web.Models.Mapping // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! if (culture == null) //throw new InvalidOperationException("Missing culture in mapping options."); - // fixme we should throw, but this is used in various places that won't set a culture yet + // todo we should throw, but this is used in various places that won't set a culture yet return source.Name; // if we don't have a name for a culture, it means the culture is not available, and diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs index 7bede52021..a50a4f190e 100644 --- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs @@ -36,7 +36,7 @@ namespace Umbraco.Web.Models.Mapping { //map the view and the config // we need to show the depracated ones for backwards compatibility - var paramEditor = Current.ParameterEditors[property.EditorAlias]; // fixme - include/filter deprecated?! + var paramEditor = Current.ParameterEditors[property.EditorAlias]; // todo - include/filter deprecated?! if (paramEditor == null) { //we'll just map this to a text box diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs index f64121e09a..e32531e61a 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs @@ -139,7 +139,7 @@ namespace Umbraco.Web.Models.Mapping // only when creating a new member and we want to have a generated password pre-filled. Value = new Dictionary { - // fixme why ignoreCase, what are we doing here?! + // todo why ignoreCase, what are we doing here?! {"generatedPassword", member.GetAdditionalDataValueIgnoreCase("GeneratedPassword", null)}, {"newPassword", member.GetAdditionalDataValueIgnoreCase("NewPassword", null)}, }, diff --git a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs index d0218b6639..3d285eb88a 100644 --- a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs +++ b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs @@ -261,7 +261,7 @@ namespace Umbraco.Web.Models.PublishedContent var visited = new HashSet(); - // fixme + // todo // _localizationService.GetXxx() is expensive, it deep clones objects // we want _localizationService.GetReadOnlyXxx() returning IReadOnlyLanguage which cannot be saved back = no need to clone diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs index 2d00370f14..c772f6ca85 100644 --- a/src/Umbraco.Web/Models/PublishedContentBase.cs +++ b/src/Umbraco.Web/Models/PublishedContentBase.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.Models [DebuggerDisplay("Content Id: {Id}, Name: {Name}")] public abstract class PublishedContentBase : IPublishedContent { - private string _url; // fixme - cannot cache urls, they depends on the current request + private string _url; // fixme/task - cannot cache urls, they depends on the current request #region ContentType @@ -79,12 +79,12 @@ namespace Umbraco.Web.Models /// The url of documents are computed by the document url providers. The url of medias are, at the moment, /// computed here from the 'umbracoFile' property -- but we should move to media url providers at some point. /// - public virtual string GetUrl(string culture = null) // fixme - consider .GetCulture("fr-FR").Url + public virtual string GetUrl(string culture = null) // todo - consider .GetCulture("fr-FR").Url { switch (ItemType) { case PublishedItemType.Content: - // fixme - consider injecting an umbraco context accessor + // todo - consider injecting an umbraco context accessor if (UmbracoContext.Current == null) throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.Current is null."); if (UmbracoContext.Current.UrlProvider == null) @@ -103,7 +103,7 @@ namespace Umbraco.Web.Models var propType = ContentType.GetPropertyType(Constants.Conventions.Media.File); - // fixme - consider implementing media url providers + // todo - consider implementing media url providers // note: that one does not support variations //This is a hack - since we now have 2 properties that support a URL: upload and cropper, we need to detect this since we always // want to return the normal URL and the cropper stores data as json diff --git a/src/Umbraco.Web/Models/PublishedProperty.cs b/src/Umbraco.Web/Models/PublishedProperty.cs index b3bad63609..05d6b5cfe0 100644 --- a/src/Umbraco.Web/Models/PublishedProperty.cs +++ b/src/Umbraco.Web/Models/PublishedProperty.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.Models var propertyEditors = Current.PropertyEditors; var dataTypeService = Current.Services.DataTypeService; - // fixme not dealing with variants + // todo not dealing with variants // but the entire thing should die anyways return propertyTypes.Select(x => diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs index 4d47e2b82a..e5ad2bb01e 100644 --- a/src/Umbraco.Web/Mvc/RenderMvcController.cs +++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs @@ -18,7 +18,6 @@ namespace Umbraco.Web.Mvc { private PublishedRequest _publishedRequest; - // fixme - delete? public RenderMvcController() { ActionInvoker = new RenderActionInvoker(); diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 29e861aec4..c9123175b1 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -44,7 +44,7 @@ namespace Umbraco.Web.Mvc private UmbracoContext UmbracoContext => _umbracoContext ?? _umbracoContextAccessor.UmbracoContext; - private UmbracoFeatures Features => Current.Factory.GetInstance(); // fixme inject + private UmbracoFeatures Features => Current.Factory.GetInstance(); // todo inject #region IRouteHandler Members diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs index bf9946a6a0..2bf73b7dd1 100644 --- a/src/Umbraco.Web/Mvc/SurfaceController.cs +++ b/src/Umbraco.Web/Mvc/SurfaceController.cs @@ -16,15 +16,12 @@ namespace Umbraco.Web.Mvc [MergeParentContextViewData] public abstract class SurfaceController : PluginController { - // fixme - delete? protected SurfaceController() - { - } + { } protected SurfaceController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger) - { - } + { } /// /// Redirects to the Umbraco page with the given id diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs index 5ba976efbf..4d70263cb8 100644 --- a/src/Umbraco.Web/Mvc/UmbracoController.cs +++ b/src/Umbraco.Web/Mvc/UmbracoController.cs @@ -22,14 +22,6 @@ namespace Umbraco.Web.Mvc // for debugging purposes internal Guid InstanceId { get; } = Guid.NewGuid(); - // note - // properties marked as [Inject] below will be property-injected (vs constructor-injected) in - // order to keep the constuctor as light as possible, so that ppl implementing eg a SurfaceController - // don't need to implement complex constructors + need to refactor them each time we change ours. - // this means that these properties have a setter. - // what can go wrong? - // fixme clear this comment - /// /// Gets or sets the Umbraco context. /// diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs index bda8e4518e..806a4bd250 100644 --- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs +++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs @@ -41,7 +41,7 @@ namespace Umbraco.Web.Mvc /// public AppCaches AppCaches { get; set; } - // fixme + // todo // previously, Services and ApplicationCache would derive from UmbracoContext.Application, which // was an ApplicationContext - so that everything derived from UmbracoContext. // UmbracoContext is fetched from the data tokens, thus allowing the view to be rendered with a diff --git a/src/Umbraco.Web/Properties/AssemblyInfo.cs b/src/Umbraco.Web/Properties/AssemblyInfo.cs index 1709204920..9a1b248284 100644 --- a/src/Umbraco.Web/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Web/Properties/AssemblyInfo.cs @@ -16,10 +16,6 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Umbraco.Tests")] [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")] -[assembly: InternalsVisibleTo("Umbraco.VisualStudio")] // fixme - what is this? -[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")] // fixme - why? -[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.AspNet")] // fixme - why? - // Allow this to be mocked in our unit tests [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs index b471a42266..c238f93467 100644 --- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs @@ -8,11 +8,11 @@ namespace Umbraco.Web.PropertyEditors /// public class GridConfiguration { - //fixme: Make these strongly typed, for now this works though + //todo: Make these strongly typed, for now this works though [ConfigurationField("items", "Grid", "views/propertyeditors/grid/grid.prevalues.html", Description = "Grid configuration")] public JObject Items { get; set; } - //fixme: Make these strongly typed, for now this works though + //todo: Make these strongly typed, for now this works though [ConfigurationField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")] public JObject Rte { get; set; } } diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs index 70b705f397..2ca58b06e2 100644 --- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs @@ -37,7 +37,7 @@ namespace Umbraco.Web.PropertyEditors _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings)); _dataTypeService = dataTypeService; - //fixme: inject? + //todo: inject? _autoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, _contentSettings); } diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs index 88da8982c7..6ee0d23d95 100644 --- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs @@ -16,7 +16,7 @@ namespace Umbraco.Web.PropertyEditors /// /// The value editor for the image cropper property editor. /// - internal class ImageCropperPropertyValueEditor : DataValueEditor // fixme core vs web? + internal class ImageCropperPropertyValueEditor : DataValueEditor // todo core vs web? { private readonly ILogger _logger; private readonly IMediaFileSystem _mediaFileSystem; diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs index 507251043b..1b46a7a8a8 100644 --- a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs @@ -62,7 +62,7 @@ namespace Umbraco.Web.PropertyEditors [ConfigurationField("bulkActionPermissions", "Bulk Action Permissions", "views/propertyeditors/listview/bulkactionpermissions.prevalues.html", Description = "The bulk actions that are allowed from the list view")] - public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // fixme managing defaults? + public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // todomanaging defaults? [ConfigurationField("tabName", "Tab Name", "textstring", Description = "The name of the listview tab (default if empty: 'Child Items')")] public string TabName { get; set; } @@ -76,7 +76,7 @@ namespace Umbraco.Web.PropertyEditors public string Header { get; set; } [JsonProperty("isSystem")] - public int IsSystem { get; set; } // fixme bool + public int IsSystem { get; set; } // todo bool } public class Layout @@ -91,7 +91,7 @@ namespace Umbraco.Web.PropertyEditors public string Icon { get; set; } [JsonProperty("isSystem")] - public int IsSystem { get; set; } // fixme bool + public int IsSystem { get; set; } // todo bool [JsonProperty("selected")] public bool Selected { get; set; } diff --git a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs index 1417e5ebb2..77c5c04985 100644 --- a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs @@ -4,7 +4,7 @@ using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { - // fixme - MacroContainerPropertyEditor is deprecated, but what's the alternative? + // todo - MacroContainerPropertyEditor is deprecated, but what's the alternative? [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group="rich content", Icon="icon-settings-alt", IsDeprecated = true)] public class MacroContainerPropertyEditor : DataEditor { diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs index a76d844dd6..59a96a0e41 100644 --- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.PropertyEditors /// public override MultipleTextStringConfiguration FromConfigurationEditor(IDictionary editorValues, MultipleTextStringConfiguration configuration) { - // fixme this isn't pretty + // todo this isn't pretty //the values from the editor will be min/max fieds and we need to format to json in one field // is the editor sending strings or ints or?! var min = (editorValues.ContainsKey("min") ? editorValues["min"].ToString() : "0").TryConvertTo(); @@ -57,4 +57,4 @@ namespace Umbraco.Web.PropertyEditors }; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs index 74c8744ead..7ff6439e08 100644 --- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs @@ -42,8 +42,6 @@ namespace Umbraco.Web.PropertyEditors : Current.Services.ContentTypeService.Get(contentTypeAlias); } - //fixme: Need to add a custom IPropertyIndexValueFactory for this editor - #region Pre Value Editor protected override IConfigurationEditor CreateConfigurationEditor() => new NestedContentConfigurationEditor(); diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs index 43053addd4..df29687838 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors /// public class RichTextConfiguration { - //fixme: Make these strongly typed, for now this works though + //todo: Make these strongly typed, for now this works though [ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)] public JObject Editor { get; set; } diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs index 6d962c42f1..1089f3d5aa 100644 --- a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors public class TrueFalseConfiguration { [ConfigurationField("default", "Default Value", "boolean")] - public string Default { get; set; } // fixme - well, true or false?! + public string Default { get; set; } // todo - well, true or false?! [ConfigurationField("labelOn", "Write a label text", "textstring")] public string Label { get; set; } diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs index de92654ffb..155e59133d 100644 --- a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs +++ b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs @@ -209,7 +209,7 @@ namespace Umbraco.Web.PublishedCache /// The alias is case-insensitive. PublishedContentType GetContentType(string alias); - // fixme - can we implement this, now? maybe only with NuCache else will throw NotImplemented... + // todo - can we implement this, now? maybe only with NuCache else will throw NotImplemented... IEnumerable GetByContentType(PublishedContentType contentType); } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs index 566ab240c1..44d38c8f3a 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs @@ -29,7 +29,7 @@ namespace Umbraco.Web.PublishedCache.NuCache #region Constructor - // fixme ISSUE + // todo - figure this out // after the current snapshot has been resync-ed // it's too late for UmbracoContext which has captured previewDefault and stuff into these ctor vars // but, no, UmbracoContext returns snapshot.Content which comes from elements SO a resync should create a new cache diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs index 2c2101b066..647adaad91 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs @@ -116,7 +116,7 @@ namespace Umbraco.Web.PublishedCache.NuCache Draft = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel(); Published = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel(); - ChildContentIds = origin.ChildContentIds; // can be the *same* list FIXME oh really? + ChildContentIds = origin.ChildContentIds; // can be the *same* list } // everything that is common to both draft and published versions diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs index ca5a5db88c..0cf2c231b5 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs @@ -38,7 +38,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private volatile int _wlocked; private List> _wchanges; - // fixme - collection trigger (ok for now) + // todo - collection trigger (ok for now) // see SnapDictionary notes private const long CollectMinGenDelta = 8; @@ -104,7 +104,7 @@ namespace Umbraco.Web.PublishedCache.NuCache } // gets a scope contextual representing a locked writer to the dictionary - // fixme GetScopedWriter? should the dict have a ref onto the scope provider? + // todo GetScopedWriter? should the dict have a ref onto the scope provider? public IDisposable GetWriter(IScopeProvider scopeProvider) { return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped)); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs index ccd0e18dd7..ddf9023d84 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs @@ -36,7 +36,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource // write each variation foreach (var (culture, variation) in variations) { - // fixme - it's weird we're dealing with cultures here, and languageId in properties + // todo - it's weird we're dealing with cultures here, and languageId in properties PrimitiveSerializer.String.WriteTo(culture, stream); // should never be null WriteObject(variation.Name, stream); // write an object in case it's null (though... should not happen) diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs index 4531d37b2b..8e9e86b4fc 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs @@ -15,7 +15,7 @@ using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { - // fixme - use SqlTemplate for these queries else it's going to be horribly slow! + // todo - use SqlTemplate for these queries else it's going to be horribly slow! // provides efficient database access for NuCache internal class DatabaseDataSource : IDataSource diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs index 4317a9b1ee..9e50f50c86 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs @@ -12,14 +12,14 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource public string Culture { get => _culture; - set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // fixme or fallback to string.Empty? CANNOT be null + set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // todo or fallback to string.Empty? CANNOT be null } [JsonProperty("seg")] public string Segment { get => _segment; - set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // fixme or fallback to string.Empty? CANNOT be null + set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // todo or fallback to string.Empty? CANNOT be null } [JsonProperty("val")] diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 1c1f7d034e..fc79971982 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -367,7 +367,6 @@ - diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs index f4bd7dd4fc..94e1b6e923 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs @@ -35,7 +35,7 @@ namespace Umbraco.Web._Legacy.PackageActions { if (rootDoc.Name.Trim() == documentName.Trim() && rootDoc.ContentType != null) { - // fixme variants? + // todo variants? Current.Services.ContentService.SaveAndPublishBranch(rootDoc, true); break; }