diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html index 6f04b702b2..7b46e9e33d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html @@ -1,18 +1,5 @@
- - - -
diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs index f2d2d5dcd3..478c14b5c4 100644 --- a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs +++ b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs @@ -115,8 +115,6 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Macros protected IEnumerable GetMacroParameterEditors() { - // we need to show the depracated ones for backwards compatibility - // FIXME not managing deprecated here?! return Current.ParameterEditors; } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs index 65b7a1560a..d1e1d63630 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs @@ -273,8 +273,6 @@ namespace Umbraco.Web.PublishedCache.NuCache /// public override PublishedItemType ItemType => _contentNode.ContentType.ItemType; - // fixme - // was => _contentData.Published == false; /// public override bool IsDraft(string culture = null) { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index 3cca34fe77..8675aefd1a 100755 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -201,7 +201,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private void InitializeRepositoryEvents() { - //fixme: The reason these events are in the repository is for legacy, the events should exist at the service + //todo: The reason these events are in the repository is for legacy, the events should exist at the service // level now since we can fire these events within the transaction... so move the events to service level // plug repository event handlers @@ -584,7 +584,7 @@ namespace Umbraco.Web.PublishedCache.NuCache continue; } - // fixme - should we do some RV check here? (later) + // todo- should we do some RV check here? (later) var capture = payload; using (var scope = _scopeProvider.CreateScope()) @@ -674,7 +674,7 @@ namespace Umbraco.Web.PublishedCache.NuCache continue; } - // fixme - should we do some RV checks here? (later) + // todo- should we do some RV checks here? (later) var capture = payload; using (var scope = _scopeProvider.CreateScope()) @@ -773,7 +773,7 @@ namespace Umbraco.Web.PublishedCache.NuCache using (_contentStore.GetWriter(_scopeProvider)) using (_mediaStore.GetWriter(_scopeProvider)) { - // fixme - need to add a datatype lock + // todo - need to add a datatype lock // this is triggering datatypes reload in the factory, and right after we create some // content types by loading them ... there's a race condition here, which would require // some locking on datatypes diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs index 67fe72d31b..b0231368af 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs @@ -30,7 +30,6 @@ namespace Umbraco.Web.PublishedCache.NuCache private Task _collectTask; private volatile int _wlocked; - // fixme - collection trigger (ok for now) // minGenDelta to be adjusted // we may want to throttle collects even if delta is reached // we may want to force collect if delta is not reached but very old @@ -107,7 +106,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? + // GetScopedWriter? should the dict have a ref onto the scope provider? public IDisposable GetWriter(IScopeProvider scopeProvider) { return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped)); diff --git a/src/Umbraco.Web/PublishedCache/PublishedElement.cs b/src/Umbraco.Web/PublishedCache/PublishedElement.cs index 6c90a28e0d..41902e3e26 100644 --- a/src/Umbraco.Web/PublishedCache/PublishedElement.cs +++ b/src/Umbraco.Web/PublishedCache/PublishedElement.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.PublishedCache // // at the moment we do NOT support models for sets - that would require // an entirely new models factory + not even sure it makes sense at all since - // sets are created manually fixme yes it does! + // sets are created manually todo yes it does! - what does this all mean? // internal class PublishedElement : IPublishedElement { diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs index 46abc098cc..ef95b2846c 100644 --- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs +++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs @@ -25,7 +25,6 @@ namespace Umbraco.Web.PublishedCache _membershipUser = member; _publishedMemberType = publishedMemberType ?? throw new ArgumentNullException(nameof(publishedMemberType)); - // fixme // RawValueProperty is used for two things here // - for the 'map properties' thing that we should really get rid of // - for populating properties that every member should always have, and that we force-create @@ -49,8 +48,6 @@ namespace Umbraco.Web.PublishedCache #region Membership provider member properties - // fixme why this? - public string Email => _membershipUser.Email; public string UserName => _membershipUser.Username; diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs index ade6cbf30b..672aad1e3e 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Scoping; namespace Umbraco.Web.PublishedCache.XmlPublishedCache { - // fixme should be a ScopeContextualBase + // todo should be a ScopeContextualBase internal class SafeXmlReaderWriter : IDisposable { private readonly bool _scoped; diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs index 2e19fc423b..2b3bc39452 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs @@ -369,7 +369,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } catch (InvalidOperationException e) { - // fixme - enable! + // todo - enable! //content.Instance.RefreshContentFromDatabase(); throw new InvalidOperationException($"{e.Message}. This usually indicates that the content cache is corrupt; the content cache has been rebuilt in an attempt to self-fix the issue."); } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs index 614515e433..0d7d188dac 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs @@ -69,7 +69,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache // internal for unit tests // no file nor db, no config check - // fixme - er, we DO have a DB? + // todo - er, we DO have a DB? internal XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache, IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom, bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IGlobalSettings globalSettings, IEntityXmlSerializer entitySerializer) @@ -602,7 +602,7 @@ AND (umbracoNode.id=@id)"; // should we have async versions that would do: ? // var releaser = await _xmlLock.LockAsync(); // - // fixme - not sure about the "resync current published snapshot" thing here, see 7.6... + // todo - not sure about the "resync current published snapshot" thing here, see 7.6... // gets a locked safe read access to the main xml private SafeXmlReaderWriter GetSafeXmlReader() @@ -641,7 +641,7 @@ AND (umbracoNode.id=@id)"; public void EnsureFilePermission() { - // FIXME - but do we really have a store, initialized, at that point? + // todo - but do we really have a store, initialized, at that point? var filename = _xmlFileName + ".temp"; File.WriteAllText(filename, "TEMP"); File.Delete(filename); @@ -1559,8 +1559,8 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; // need to update the published xml if we're saving the published version, // or having an impact on that version - we update the published xml even when masked - // fixme - in the repo... either its 'unpublished' and 'publishing', or 'published' and 'published', this has changed! - // fixme - what are we serializing really? which properties? + // todo - in the repo... either its 'unpublished' and 'publishing', or 'published' and 'published', this has changed! + // todo - what are we serializing really? which properties? // if not publishing, no change to published xml if (((Content) entity).PublishedState != PublishedState.Publishing) @@ -1669,7 +1669,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; // RepositoryCacheMode.Scoped because we do NOT want to use the L2 cache that may be out-of-sync // hopefully this does not cause issues and we're not nested in another scope w/different mode - // fixme - well, guess what? + // todo - well, guess what? // original code made sure the repository used no cache // now we're using the Scoped scope cache mode // and then? @@ -2027,7 +2027,7 @@ AND cmsPreviewXml.nodeId IS NULL OR cmsPreviewXml.xml NOT LIKE '% key=""' { // every non-trashed media item should have a corresponding row in cmsContentXml // and that row should have the key="..." attribute - // fixme - where's the trashed test here? + // todo - where's the trashed test here? var mediaObjectType = Constants.ObjectTypes.Media; var db = scope.Database; diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index f38df4288f..530c9bd9b4 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -251,7 +251,7 @@ namespace Umbraco.Web public static IEnumerable SearchDescendants(this IPublishedContent content, string term, string indexName = null) { - //fixme: pass in the IExamineManager + //todo inject examine manager indexName = string.IsNullOrEmpty(indexName) ? Constants.UmbracoIndexes.ExternalIndexName : indexName; if (!ExamineManager.Instance.TryGetIndex(indexName, out var index)) @@ -272,7 +272,7 @@ namespace Umbraco.Web public static IEnumerable SearchChildren(this IPublishedContent content, string term, string indexName = null) { - //fixme: pass in the IExamineManager + //todo inject examine manager indexName = string.IsNullOrEmpty(indexName) ? Constants.UmbracoIndexes.ExternalIndexName : indexName; if (!ExamineManager.Instance.TryGetIndex(indexName, out var index)) @@ -954,7 +954,7 @@ namespace Umbraco.Web /// public static IEnumerable Children(this IPublishedContent content, string culture = null) { - if (content == null) throw new ArgumentNullException(nameof(content)); // fixme wtf is this? + if (content == null) throw new ArgumentNullException(nameof(content)); // fixme/task wtf is this? return content.Children.Where(x => { @@ -1017,7 +1017,7 @@ namespace Umbraco.Web /// /// Gets the first child of the content, of a given content type. /// - public static IPublishedContent FirstChild(this IPublishedContent content, string alias, string culture = null) // fixme oops + public static IPublishedContent FirstChild(this IPublishedContent content, string alias, string culture = null) // fixme/task oops { return content.Children(culture,alias).FirstOrDefault(); } diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs index cd6ede9a7c..3250dbc2ce 100644 --- a/src/Umbraco.Web/PublishedElementExtensions.cs +++ b/src/Umbraco.Web/PublishedElementExtensions.cs @@ -69,25 +69,6 @@ namespace Umbraco.Web return prop != null && prop.HasValue(culture, segment); } - // fixme - .Value() refactoring - in progress - // missing variations... - - /// - /// Returns one of two strings depending on whether the content has a value for a property identified by its alias. - /// - /// The content. - /// The property alias. - /// The value to return if the content has a value for the property. - /// The value to return if the content has no value for the property. - /// Either or depending on whether the content - /// has a value for the property identified by the alias. - public static IHtmlString IfValue(this IPublishedElement content, string alias, string valueIfTrue, string valueIfFalse = null) - { - return content.HasValue(alias) - ? new HtmlString(valueIfTrue) - : new HtmlString(valueIfFalse ?? string.Empty); - } - #endregion #region Value @@ -165,57 +146,6 @@ namespace Umbraco.Web #endregion - #region Value or Umbraco.Field - WORK IN PROGRESS - - // fixme - .Value() refactoring - in progress - // trying to reproduce Umbraco.Field so we can get rid of it - // - // what we want: - // - alt aliases - // - recursion - // - default value - // - before & after (if value) - // - // convertLineBreaks: should be an extension string.ConvertLineBreaks() - // stripParagraphs: should be an extension string.StripParagraphs() - // format: should use the standard .ToString(format) - // - // see UmbracoComponentRenderer.Field - which is ugly ;-( - - // recurse first, on each alias (that's how it's done in Field) - // - // there is no strongly typed recurse, etc => needs to be in ModelsBuilder? - - // that one can only happen in ModelsBuilder as that's where the attributes are defined - // the attribute that carries the alias is in ModelsBuilder! - //public static TValue Value(this TModel content, Expression> propertySelector, ...) - // where TModel : IPublishedElement - //{ - // PropertyInfo pi = GetPropertyFromExpression(propertySelector); - // var attr = pi.GetCustomAttribute(); - // var alias = attr.Alias; - // return content.Value(alias, ...) - //} - - // recurse should be implemented via fallback - - // todo - that one should be refactored, missing culture and so many things - public static IHtmlString Value(this IPublishedElement content, string aliases, Func format, string alt = "") - { - if (format == null) format = x => x.ToString(); - - var property = aliases.Split(',') - .Where(x => string.IsNullOrWhiteSpace(x) == false) - .Select(x => content.GetProperty(x.Trim())) - .FirstOrDefault(x => x != null); - - return property != null - ? new HtmlString(format(property.Value())) - : new HtmlString(alt); - } - - #endregion - #region ToIndexedArray public static IndexedArrayItem[] ToIndexedArray(this IEnumerable source) diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs index 4979a59d45..fc1712dfbd 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing return v.InvariantContains(a1) || v.InvariantContains(a2); } - // fixme - even with Linq, what happens below has to be horribly slow + // todo - even with Linq, what happens below has to be horribly slow // but the only solution is to entirely refactor url providers to stop being dynamic if (rootNodeId > 0) diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs index edfcb33aa5..8ba06363dc 100644 --- a/src/Umbraco.Web/Routing/DomainHelper.cs +++ b/src/Umbraco.Web/Routing/DomainHelper.cs @@ -107,7 +107,7 @@ namespace Umbraco.Web.Routing /// An optional function to filter the list of domains, if more than one applies. /// The domain and its normalized uri, that best matches the specified uri and cultures. /// - /// fixme - must document and explain this all + /// todo - must document and explain this all /// If is null, pick the first domain that matches , /// else the first that matches , else the first one (ordered by id), else null. /// If is not null, look for domains that would be a base uri of the current uri, @@ -244,7 +244,7 @@ namespace Umbraco.Web.Routing /// The domains and their normalized uris, that match the specified uri. internal static IEnumerable SelectDomains(IEnumerable domains, Uri uri) { - // fixme where are we matching ?!!? + // todo where are we matching ?!!? return domains .Where(d => d.IsWildcard == false) .Select(d => new DomainAndUri(d, uri)) diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs index 04e189785b..b95977c3a3 100644 --- a/src/Umbraco.Web/Routing/PublishedRouter.cs +++ b/src/Umbraco.Web/Routing/PublishedRouter.cs @@ -19,8 +19,7 @@ using RenderingEngine = Umbraco.Core.RenderingEngine; namespace Umbraco.Web.Routing { - // fixme - make this public - // fixme - making sense to have an interface? + // todo - making sense to have an interface? public class PublishedRouter { private readonly IWebRoutingSection _webRoutingSection; @@ -53,7 +52,7 @@ namespace Umbraco.Web.Routing GetRolesForLogin = s => Roles.Provider.GetRolesForUser(s); } - // fixme + // todo // in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense // killing it entirely, if we need cache, just implement it properly !! // this is all soooo weird @@ -381,7 +380,7 @@ namespace Umbraco.Web.Routing // NOTE: we could start with what's the current default? - // fixme - bad - we probably should be using the appropriate filesystems! + // todo - bad - we probably should be using the appropriate filesystems! if (FindTemplateRenderingEngineInDirectory(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.MvcViews)), alias, new[] { ".cshtml", ".vbhtml" })) diff --git a/src/Umbraco.Web/Routing/SiteDomainHelper.cs b/src/Umbraco.Web/Routing/SiteDomainHelper.cs index 30abfea901..7879b22402 100644 --- a/src/Umbraco.Web/Routing/SiteDomainHelper.cs +++ b/src/Umbraco.Web/Routing/SiteDomainHelper.cs @@ -181,7 +181,7 @@ namespace Umbraco.Web.Routing /// public virtual IEnumerable MapDomains(IReadOnlyCollection domainAndUris, Uri current, bool excludeDefault, string culture, string defaultCulture) { - // fixme ignoring cultures entirely? + // todo ignoring cultures entirely? var currentAuthority = current.GetLeftPart(UriPartial.Authority); KeyValuePair[] candidateSites = null; @@ -279,7 +279,7 @@ namespace Umbraco.Web.Routing if (domainAndUris == null) throw new ArgumentNullException(nameof(domainAndUris)); if (domainAndUris.Count == 0) throw new ArgumentException("Cannot be empty.", nameof(domainAndUris)); - // fixme how shall we deal with cultures? + // todo how shall we deal with cultures? // we do our best, but can't do the impossible // get the "default" domain ie the first one for the culture, else the first one (exists, length > 0) diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs index 1a0bf8d1b0..832699b5d7 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs @@ -108,7 +108,7 @@ namespace Umbraco.Web.Runtime .SetDefaultRenderMvcController(); // default controller for template views composition.WithCollectionBuilder() - .Add(() => composition.TypeLoader.GetTypes()); // fixme which searchable trees?! + .Add(() => composition.TypeLoader.GetTypes()); composition.Register(Lifetime.Request); diff --git a/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs index e8fd754622..b478ed581c 100644 --- a/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs +++ b/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs @@ -15,6 +15,6 @@ namespace Umbraco.Web.Scheduling void Add(T task); bool TryAdd(T task); - // fixme - complete the interface? + // todo - complete the interface? } } diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs index 4d5d5a467a..0d533a4da2 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs @@ -56,7 +56,7 @@ namespace Umbraco.Web.Scheduling // ensure we run with an UmbracoContext, because this may run in a background task, // yet developers may be using the 'current' UmbracoContext in the event handlers // - // fixme + // todo // - or maybe not, CacheRefresherComponent already ensures a context when handling events // - UmbracoContext 'current' needs to be refactored and cleaned up // - batched messenger should not depend on a current HttpContext diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs index 05a1258441..4735780231 100644 --- a/src/Umbraco.Web/Search/ExamineComponent.cs +++ b/src/Umbraco.Web/Search/ExamineComponent.cs @@ -154,7 +154,6 @@ namespace Umbraco.Web.Search _rebuildOnStartupRunner = new BackgroundTaskRunner( "RebuildIndexesOnStartup", - //new BackgroundTaskRunnerOptions{ LongRunning= true }, //fixme, this flag doesn't have any affect anymore logger); _rebuildOnStartupRunner.TryAdd(task); @@ -214,7 +213,7 @@ namespace Umbraco.Web.Search // just ignore that payload // so what?! - //fixme: Rebuild the index at this point? + //todo: Rebuild the index at this point? } else // RefreshNode or RefreshBranch (maybe trashed) { diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index 6ae8ff8c96..db93df953f 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -326,7 +326,7 @@ namespace Umbraco.Web.Security switch (umbracoType) { case UmbracoObjectTypes.Member: - // fixme - need to implement Get(guid)! + // todo - need to implement Get(guid)! var memberAttempt = entityService.GetId(guidUdi.Guid, umbracoType); if (memberAttempt.Success) return GetById(memberAttempt.Result); diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index a339f45714..db786655b4 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -37,8 +37,8 @@ namespace Umbraco.Web.Templates _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext)); } - private IFileService FileService => Current.Services.FileService; // fixme inject - private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance(); // fixme inject + private IFileService FileService => Current.Services.FileService; // todo inject + private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance(); // todo inject /// diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 46ee6cd8b5..8113a85690 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -235,7 +235,6 @@ namespace Umbraco.Web.Trees AddActionNode(item, menu, true); AddActionNode(item, menu, opensDialog: true); AddActionNode(item, menu, opensDialog: true); - //fixme - conver this editor to angular AddActionNode(item, menu, true, convert: true, opensDialog: true); if (EmailSender.CanSendRequiredEmail) { @@ -308,7 +307,7 @@ namespace Umbraco.Web.Trees entity.Name = "[[" + entity.Id + "]]"; } - //fixme: Remove the need for converting to legacy + //todo: Remove the need for converting to legacy private void AddActionNode(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false, bool opensDialog = false) where TAction : IAction { diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index ae62f800e9..ccf3798270 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -401,7 +401,7 @@ namespace Umbraco.Web.Trees internal IEnumerable GetAllowedUserMenuItemsForNode(IUmbracoEntity dd) { var permission = Services.UserService.GetPermissions(Security.CurrentUser, dd.Path); - //fixme: inject + //todo: inject var actions = Current.Actions.FromEntityPermission(permission) .ToList(); diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs index 947522747d..598eb713eb 100644 --- a/src/Umbraco.Web/Trees/FilesTreeController.cs +++ b/src/Umbraco.Web/Trees/FilesTreeController.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees [Tree(Constants.Applications.Settings, "files", "Files", "icon-folder", "icon-folder", sortOrder: 13, initialize: false)] public class FilesTreeController : FileSystemTreeController { - protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // fixme inject + protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // todo inject private static readonly string[] ExtensionsStatic = { "*" }; diff --git a/src/Umbraco.Web/Trees/ITree.cs b/src/Umbraco.Web/Trees/ITree.cs index 867beda20e..2821d4bfbb 100644 --- a/src/Umbraco.Web/Trees/ITree.cs +++ b/src/Umbraco.Web/Trees/ITree.cs @@ -1,6 +1,6 @@ namespace Umbraco.Web.Trees { - //fixme - we don't really use this, it is nice to have the treecontroller, attribute and ApplicationTree streamlined to implement this but it's not used + //todo- we don't really use this, it is nice to have the treecontroller, attribute and ApplicationTree streamlined to implement this but it's not used //leave as internal for now, maybe we'll use in the future, means we could pass around ITree internal interface ITree { diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index f271d276c6..277094d3c6 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.Trees /// internal class LegacyTreeDataConverter { - //fixme: remove this whole class when everything is angularized + //todo: remove this whole class when everything is angularized /// /// This will look at the legacy IAction's JsFunctionName and convert it to a confirmation dialog view if possible diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs index cd56cc4790..191c9a7f8e 100644 --- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs +++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs @@ -9,7 +9,7 @@ namespace Umbraco.Web.Trees [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, "Scripts", "icon-folder", "icon-folder", sortOrder: 10)] public class ScriptsTreeController : FileSystemTreeController { - protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // fixme inject + protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // todo inject private static readonly string[] ExtensionsStatic = { "js" }; diff --git a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs index 548e8ae928..f64e9fd752 100644 --- a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs +++ b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, "Stylesheets", "icon-folder", "icon-folder", sortOrder: 9)] public class StylesheetsTreeController : FileSystemTreeController { - protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // fixme inject + protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // todo inject private static readonly string[] ExtensionsStatic = { "css" }; diff --git a/src/Umbraco.Web/UI/Controls/ProgressBar.cs b/src/Umbraco.Web/UI/Controls/ProgressBar.cs index a40509cfb8..3e87da1d6f 100644 --- a/src/Umbraco.Web/UI/Controls/ProgressBar.cs +++ b/src/Umbraco.Web/UI/Controls/ProgressBar.cs @@ -8,7 +8,6 @@ namespace Umbraco.Web.UI.Controls protected override void Render(System.Web.UI.HtmlTextWriter writer) { - // fixme - image is gone! base.ImageUrl = "/images/progressBar.gif"; base.AlternateText = Title; diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs index 596e834ff9..c56e4fe07f 100644 --- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs +++ b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.UI.Controls UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext)); Umbraco = new UmbracoHelper(umbracoContext, services); - // fixme inject somehow + // todo inject somehow Logger = Current.Logger; ProfilingLogger = Current.ProfilingLogger; Services = Current.Services; diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs index 9c68540c58..f4cd7f1b50 100644 --- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs +++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs @@ -31,7 +31,7 @@ namespace Umbraco.Web.UI.Controls Umbraco = new UmbracoHelper(umbracoContext, services); Members = Current.Factory.GetInstance(); - // fixme inject somehow + // todo inject somehow Logger = Current.Logger; ProfilingLogger = Current.ProfilingLogger; Services = Current.Services; diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index a4de900e7c..41ac309653 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -41,7 +41,7 @@ namespace Umbraco.Web /// A value indicating whether to replace the existing context. /// The "current" UmbracoContext. /// - /// fixme - this needs to be clarified + /// todo - this needs to be clarified /// /// If is true then the "current" UmbracoContext is replaced /// with a new one even if there is one already. See . Has to do with diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index b6ffdca105..ee57054dc9 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -325,23 +325,14 @@ namespace Umbraco.Web var umbracoType = Constants.UdiEntityType.ToUmbracoObjectType(udi.EntityType); - var entityService = Current.Services.EntityService; switch (umbracoType) { case UmbracoObjectTypes.Document: return Content(guidUdi.Guid); case UmbracoObjectTypes.Media: - // fixme - need to implement Media(guid)! - var mediaAttempt = entityService.GetId(guidUdi.Guid, umbracoType); - if (mediaAttempt.Success) - return Media(mediaAttempt.Result); - break; + return Media(guidUdi.Guid); case UmbracoObjectTypes.Member: - // fixme - need to implement Member(guid)! - var memberAttempt = entityService.GetId(guidUdi.Guid, umbracoType); - if (memberAttempt.Success) - return Member(memberAttempt.Result); - break; + return Member(guidUdi.Guid); } return null; @@ -650,7 +641,7 @@ namespace Umbraco.Web //TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and // currently there won't be any way to add this method correctly to `ITypedPublishedContentQuery` without breaking an interface and adding GUID support for media - var entityService = Current.Services.EntityService; // fixme inject + var entityService = Current.Services.EntityService; // todo inject var mediaAttempt = entityService.GetId(id, UmbracoObjectTypes.Media); return mediaAttempt.Success ? ContentQuery.Media(mediaAttempt.Result) : null; } diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs index ed56ea6053..009272963c 100644 --- a/src/Umbraco.Web/UmbracoHttpHandler.cs +++ b/src/Umbraco.Web/UmbracoHttpHandler.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web UmbracoContext = umbracoContext; Umbraco = new UmbracoHelper(umbracoContext, services); - // fixme inject somehow + // todo inject somehow Logger = Current.Logger; ProfilingLogger = Current.ProfilingLogger; Services = Current.Services; diff --git a/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs index b5a3f395ad..7828400487 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs @@ -11,6 +11,6 @@ namespace Umbraco.Web.WebApi.Filters [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)] public sealed class EnableOverrideAuthorizationAttribute : Attribute { - //fixme we should remove this and use the System.Web.Http.OverrideAuthorizationAttribute which uses IOverrideFilter instead + //todo we should remove this and use the System.Web.Http.OverrideAuthorizationAttribute which uses IOverrideFilter instead } } diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs index 1601a23bc1..2deefc8a15 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs @@ -83,13 +83,13 @@ namespace Umbraco.Web.WebApi.Filters } else if (Udi.TryParse(argument, true, out Udi udi)) { - //fixme: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services + //todo: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services nodeId = Current.Services.EntityService.GetId(udi).Result; } else { Guid.TryParse(argument, out Guid key); - //fixme: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services + //todo: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services nodeId = Current.Services.EntityService.GetId(key, UmbracoObjectTypes.Document).Result; } } diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs index f0dd58f9a9..866941d41d 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs @@ -42,7 +42,7 @@ namespace Umbraco.Web.WebApi.Filters _paramName = paramName; } - // fixme v8 guess this is not used anymore, source is ignored?! + // todo v8 guess this is not used anymore, source is ignored?! public EnsureUserPermissionForMediaAttribute(string paramName, DictionarySource source) { if (string.IsNullOrEmpty(paramName)) throw new ArgumentNullOrEmptyException(nameof(paramName)); diff --git a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs index b63e9d1505..d56411952d 100644 --- a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs @@ -5,7 +5,7 @@ using System.Web.Http.Controllers; namespace Umbraco.Web.WebApi.Filters { - //fixme remove this since we don't need it, see notes in EnableOverrideAuthorizationAttribute + //todo remove this since we don't need it, see notes in EnableOverrideAuthorizationAttribute /// /// Abstract auth filter class that can be used to enable overriding class auth filters at the action level diff --git a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs index f282fce5ba..700554e731 100644 --- a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.WebApi /// internal static bool Enable = true; - // fixme - inject! + // todo - inject! private readonly UmbracoContext _umbracoContext; private readonly IRuntimeState _runtimeState;