diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 8698aaeb09..295d41b097 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -27,6 +27,7 @@ + @@ -59,8 +60,6 @@ - - @@ -68,5 +67,4 @@ - \ No newline at end of file diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1 index 19af134c2a..46a9df0a4a 100644 --- a/build/NuSpecs/tools/install.ps1 +++ b/build/NuSpecs/tools/install.ps1 @@ -22,6 +22,12 @@ if ($project) { $umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*" Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force + # Remove Newtonsoft.Json if present in the bin folder + # If we don't do this, the correct version never gets copied in + $projectDestinationPath = Split-Path $project.FullName -Parent + $jsonDllFile = Join-Path $projectDestinationPath "bin\Newtonsoft.Json.dll" + Remove-Item $jsonDllFile -Confirm:$false + # Open readme.txt file $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') } \ No newline at end of file diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs index e66b26786c..79e4a72756 100644 --- a/src/Umbraco.Core/ApplicationContext.cs +++ b/src/Umbraco.Core/ApplicationContext.cs @@ -28,12 +28,11 @@ namespace Umbraco.Core /// /// /// - internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache) + public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache) { if (dbContext == null) throw new ArgumentNullException("dbContext"); if (serviceContext == null) throw new ArgumentNullException("serviceContext"); if (cache == null) throw new ArgumentNullException("cache"); - _databaseContext = dbContext; _services = serviceContext; ApplicationCache = cache; @@ -43,12 +42,60 @@ namespace Umbraco.Core /// Creates a basic app context /// /// - internal ApplicationContext(CacheHelper cache) + public ApplicationContext(CacheHelper cache) { ApplicationCache = cache; } - /// + /// + /// A method used to set and/or ensure that a global ApplicationContext singleton is created. + /// + /// + /// The instance to set on the global application singleton + /// + /// If set to true and the singleton is already set, it will be replaced + /// + /// + /// This is NOT thread safe + /// + public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext) + { + if (ApplicationContext.Current != null) + { + if (!replaceContext) + return ApplicationContext.Current; + } + ApplicationContext.Current = appContext; + return ApplicationContext.Current; + } + + /// + /// A method used to create and ensure that a global ApplicationContext singleton is created. + /// + /// + /// + /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app + /// startup if for some reason the boot manager is not the umbraco boot manager. + /// + /// + /// + /// + /// + /// This is NOT thread safe + /// + public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext) + { + if (ApplicationContext.Current != null) + { + if (!replaceContext) + return ApplicationContext.Current; + } + var ctx = new ApplicationContext(dbContext, serviceContext, cache); + ApplicationContext.Current = ctx; + return ApplicationContext.Current; + } + + /// /// Singleton accessor /// public static ApplicationContext Current { get; internal set; } diff --git a/src/Umbraco.Core/CacheHelper.cs b/src/Umbraco.Core/CacheHelper.cs index 8bb80670d8..601e2819ff 100644 --- a/src/Umbraco.Core/CacheHelper.cs +++ b/src/Umbraco.Core/CacheHelper.cs @@ -32,7 +32,7 @@ namespace Umbraco.Core /// /// Good for unit testing /// - internal static CacheHelper CreateDisabledCacheHelper() + public static CacheHelper CreateDisabledCacheHelper() { return new CacheHelper(null, null, null, false); } diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs index c3916a2e87..660a8073c9 100644 --- a/src/Umbraco.Core/Constants-Conventions.cs +++ b/src/Umbraco.Core/Constants-Conventions.cs @@ -99,6 +99,10 @@ namespace Umbraco.Core /// public static class Member { + public static readonly string UmbracoMemberProviderName = "UmbracoMembershipProvider"; + + public static readonly string UmbracoRoleProviderName = "UmbracoRoleProvider"; + /// /// Property alias for a Members Password Question /// diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs index 3c2a8d6752..e423f58c62 100644 --- a/src/Umbraco.Core/Constants-PropertyEditors.cs +++ b/src/Umbraco.Core/Constants-PropertyEditors.cs @@ -411,6 +411,11 @@ namespace Umbraco.Core /// Alias for the XPath DropDownList datatype. /// public const string XPathDropDownListAlias = "Umbraco.XPathDropDownList"; + + /// + /// Alias for the email address property editor + /// + public const string EmailAddressAlias = "Umbraco.EmailAddress"; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs index 4062e2a52f..64a40f32e4 100644 --- a/src/Umbraco.Core/DatabaseContext.cs +++ b/src/Umbraco.Core/DatabaseContext.cs @@ -29,7 +29,7 @@ namespace Umbraco.Core private string _providerName; private DatabaseSchemaResult _result; - internal DatabaseContext(IDatabaseFactory factory) + public DatabaseContext(IDatabaseFactory factory) { _factory = factory; } diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs index 47dbfacb45..49839828fd 100644 --- a/src/Umbraco.Core/Manifest/ManifestParser.cs +++ b/src/Umbraco.Core/Manifest/ManifestParser.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.PropertyEditors; namespace Umbraco.Core.Manifest @@ -18,7 +19,8 @@ namespace Umbraco.Core.Manifest private readonly DirectoryInfo _pluginsDir; //used to strip comments - private static readonly Regex Comments = new Regex("(/\\*.*\\*/)", RegexOptions.Compiled); + private static readonly Regex CommentsSurround = new Regex(@"/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/", RegexOptions.Compiled); + private static readonly Regex CommentsLine = new Regex(@"//.*?$", RegexOptions.Compiled | RegexOptions.Multiline); public ManifestParser(DirectoryInfo pluginsDir) { @@ -116,11 +118,20 @@ namespace Umbraco.Core.Manifest { if (m.IsNullOrWhiteSpace()) continue; - //remove any comments first, NOTE: I think JSON.Net will do this for us! but we'll leave it here for now - Comments.Replace(m, match => ""); + //remove any comments first + var replaced = CommentsSurround.Replace(m, match => " "); + replaced = CommentsLine.Replace(replaced, match => ""); - - var deserialized = JsonConvert.DeserializeObject(m); + JObject deserialized; + try + { + deserialized = JsonConvert.DeserializeObject(replaced); + } + catch (Exception ex) + { + LogHelper.Error("An error occurred parsing manifest with contents: " + m, ex); + continue; + } //validate the javascript var init = deserialized.Properties().Where(x => x.Name == "javascript").ToArray(); @@ -130,10 +141,10 @@ namespace Umbraco.Core.Manifest } //validate the css - var cssinit = deserialized.Properties().Where(x => x.Name == "stylesheet").ToArray(); + var cssinit = deserialized.Properties().Where(x => x.Name == "css").ToArray(); if (cssinit.Length > 1) { - throw new FormatException("The manifest is not formatted correctly contains more than one 'stylesheet' element"); + throw new FormatException("The manifest is not formatted correctly contains more than one 'css' element"); } //validate the property editors section @@ -146,7 +157,7 @@ namespace Umbraco.Core.Manifest var jConfig = init.Any() ? (JArray)deserialized["javascript"] : new JArray(); ReplaceVirtualPaths(jConfig); - var cssConfig = cssinit.Any() ? (JArray)deserialized["stylesheet"] : new JArray(); + var cssConfig = cssinit.Any() ? (JArray)deserialized["css"] : new JArray(); ReplaceVirtualPaths(cssConfig); //replace virtual paths for each property editor @@ -168,7 +179,7 @@ namespace Umbraco.Core.Manifest var manifest = new PackageManifest() { JavaScriptInitialize = jConfig, - StyleSheetInitialize = cssConfig, + StylesheetInitialize = cssConfig, PropertyEditors = propEditors.Any() ? (JArray)deserialized["propertyEditors"] : new JArray(), ParameterEditors = propEditors.Any() ? (JArray)deserialized["parameterEditors"] : new JArray() }; diff --git a/src/Umbraco.Core/Manifest/PackageManifest.cs b/src/Umbraco.Core/Manifest/PackageManifest.cs index 4426bb36fb..3475a60312 100644 --- a/src/Umbraco.Core/Manifest/PackageManifest.cs +++ b/src/Umbraco.Core/Manifest/PackageManifest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Core.Manifest /// /// The json array used to initialize the application with the CSS dependencies required /// - public JArray StyleSheetInitialize { get; set; } + public JArray StylesheetInitialize { get; set; } /// /// The json array of property editors diff --git a/src/Umbraco.Core/Models/ApplicationTree.cs b/src/Umbraco.Core/Models/ApplicationTree.cs index d964dc2bff..cc754ec694 100644 --- a/src/Umbraco.Core/Models/ApplicationTree.cs +++ b/src/Umbraco.Core/Models/ApplicationTree.cs @@ -4,7 +4,7 @@ using System.Diagnostics; namespace Umbraco.Core.Models { [DebuggerDisplay("Tree - {Title} ({ApplicationAlias})")] - internal class ApplicationTree + public class ApplicationTree { /// /// Initializes a new instance of the class. @@ -23,7 +23,7 @@ namespace Umbraco.Core.Models /// The icon closed. /// The icon opened. /// The tree type. - public ApplicationTree(bool initialize, byte sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type) + public ApplicationTree(bool initialize, int sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type) { this.Initialize = initialize; this.SortOrder = sortOrder; @@ -45,7 +45,7 @@ namespace Umbraco.Core.Models /// Gets or sets the sort order. /// /// The sort order. - public byte SortOrder { get; set; } + public int SortOrder { get; set; } /// /// Gets the application alias. diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs index c63c8eba1e..011726e615 100644 --- a/src/Umbraco.Core/Models/ContentBase.cs +++ b/src/Umbraco.Core/Models/ContentBase.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.ComponentModel; using System.Diagnostics; using System.Globalization; using System.Linq; @@ -50,7 +51,7 @@ namespace Umbraco.Core.Models _contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture)); _properties = properties; _properties.EnsurePropertyTypes(PropertyTypes); - AdditionalData = new Dictionary(); + _additionalData = new Dictionary(); } /// @@ -74,7 +75,7 @@ namespace Umbraco.Core.Models _contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture)); _properties = properties; _properties.EnsurePropertyTypes(PropertyTypes); - AdditionalData = new Dictionary(); + _additionalData = new Dictionary(); } private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name); @@ -255,6 +256,16 @@ namespace Umbraco.Core.Models } } + private readonly IDictionary _additionalData; + /// + /// Some entities may expose additional data that other's might not, this custom data will be available in this collection + /// + [EditorBrowsable(EditorBrowsableState.Never)] + IDictionary IUmbracoEntity.AdditionalData + { + get { return _additionalData; } + } + /// /// Some entities may expose additional data that other's might not, this custom data will be available in this collection /// @@ -453,7 +464,7 @@ namespace Umbraco.Core.Models /// also reset the dirty changes made to the content's Properties (user defined) /// /// - internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) + public override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) { base.ResetDirtyProperties(rememberPreviouslyChangedProperties); diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs index 0457c113b7..87acf07d45 100644 --- a/src/Umbraco.Core/Models/ContentTypeBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeBase.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.ComponentModel; using System.Linq; using System.Reflection; using System.Runtime.Serialization; @@ -42,7 +43,7 @@ namespace Umbraco.Core.Models _allowedContentTypes = new List(); _propertyGroups = new PropertyGroupCollection(); _propertyTypes = new PropertyTypeCollection(); - AdditionalData = new Dictionary(); + _additionalData = new Dictionary(); } protected ContentTypeBase(IContentTypeBase parent) @@ -53,7 +54,7 @@ namespace Umbraco.Core.Models _allowedContentTypes = new List(); _propertyGroups = new PropertyGroupCollection(); _propertyTypes = new PropertyTypeCollection(); - AdditionalData = new Dictionary(); + _additionalData = new Dictionary(); } private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name); @@ -316,6 +317,16 @@ namespace Umbraco.Core.Models } } + private readonly IDictionary _additionalData; + /// + /// Some entities may expose additional data that other's might not, this custom data will be available in this collection + /// + [EditorBrowsable(EditorBrowsableState.Never)] + IDictionary IUmbracoEntity.AdditionalData + { + get { return _additionalData; } + } + /// /// Some entities may expose additional data that other's might not, this custom data will be available in this collection /// diff --git a/src/Umbraco.Core/Models/DataTypeDefinition.cs b/src/Umbraco.Core/Models/DataTypeDefinition.cs index a930bf94c4..8fcc8b6a13 100644 --- a/src/Umbraco.Core/Models/DataTypeDefinition.cs +++ b/src/Umbraco.Core/Models/DataTypeDefinition.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Reflection; using System.Runtime.Serialization; using Umbraco.Core.Models.EntityBase; @@ -34,14 +35,14 @@ namespace Umbraco.Core.Models { _parentId = parentId; _propertyEditorAlias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(controlId, true); - AdditionalData = new Dictionary(); + + _additionalData = new Dictionary(); } - public DataTypeDefinition(int parentId, string propertyEditorAlias) { _parentId = parentId; _propertyEditorAlias = propertyEditorAlias; - AdditionalData = new Dictionary(); + _additionalData = new Dictionary(); } private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name); @@ -173,9 +174,11 @@ namespace Umbraco.Core.Models _trashed = value; return _trashed; }, _trashed, TrashedSelector); + //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data + _additionalData["Trashed"] = value; } } - + [DataMember] public string PropertyEditorAlias { @@ -209,7 +212,7 @@ namespace Umbraco.Core.Models var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(value, true); PropertyEditorAlias = alias; //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data - AdditionalData["DatabaseType"] = value; + _additionalData["ControlId"] = value; } } @@ -229,10 +232,20 @@ namespace Umbraco.Core.Models }, _databaseType, DatabaseTypeSelector); //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data - AdditionalData["DatabaseType"] = value; + _additionalData["DatabaseType"] = value; } } + private readonly IDictionary _additionalData; + /// + /// Some entities may expose additional data that other's might not, this custom data will be available in this collection + /// + [EditorBrowsable(EditorBrowsableState.Never)] + IDictionary IUmbracoEntity.AdditionalData + { + get { return _additionalData; } + } + /// /// Some entities may expose additional data that other's might not, this custom data will be available in this collection /// diff --git a/src/Umbraco.Core/Models/EntityBase/IRememberBeingDirty.cs b/src/Umbraco.Core/Models/EntityBase/IRememberBeingDirty.cs index 94a88d312e..efebbd7c74 100644 --- a/src/Umbraco.Core/Models/EntityBase/IRememberBeingDirty.cs +++ b/src/Umbraco.Core/Models/EntityBase/IRememberBeingDirty.cs @@ -9,5 +9,6 @@ bool WasDirty(); bool WasPropertyDirty(string propertyName); void ForgetPreviouslyDirtyProperties(); + void ResetDirtyProperties(bool rememberPreviouslyChangedProperties); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs b/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs index dc65c583bc..cf34296281 100644 --- a/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs +++ b/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs @@ -108,7 +108,7 @@ namespace Umbraco.Core.Models.EntityBase /// Please note that resetting the dirty properties could potentially /// obstruct the saving of a new or updated entity. /// - internal virtual void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) + public virtual void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) { if (rememberPreviouslyChangedProperties) { diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs index c754cab326..a0f0bd9651 100644 --- a/src/Umbraco.Core/Models/Macro.cs +++ b/src/Umbraco.Core/Models/Macro.cs @@ -172,7 +172,7 @@ namespace Umbraco.Core.Models OnPropertyChanged(PropertiesSelector); } - internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) + public override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) { _addedProperties.Clear(); _removedProperties.Clear(); diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs index 335beb9ee4..3530e94c59 100644 --- a/src/Umbraco.Core/Models/Member.cs +++ b/src/Umbraco.Core/Models/Member.cs @@ -20,6 +20,17 @@ namespace Umbraco.Core.Models private object _providerUserKey; private Type _userTypeKey; + /// + /// Constructor for creating a Member object + /// + /// Name of the content + /// ContentType for the current Content object + public Member(string name, IMemberType contentType) + : base(name, -1, contentType, new PropertyCollection()) + { + _contentType = contentType; + } + public Member(string name, string email, string username, string password, int parentId, IMemberType contentType) : base(name, parentId, contentType, new PropertyCollection()) { @@ -427,7 +438,7 @@ namespace Umbraco.Core.Models public override void ChangeTrashedState(bool isTrashed, int parentId = -20) { - throw new NotImplementedException("Members can't be trashed as no Recycle Bin exists, so use of this method is invalid"); + throw new NotSupportedException("Members can't be trashed as no Recycle Bin exists, so use of this method is invalid"); } /* Internal experiment - only used for mapping queries. diff --git a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs index 06e50ecd9b..d55cc77f66 100644 --- a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs +++ b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs @@ -2,6 +2,8 @@ namespace Umbraco.Core.Models.Membership { + //TODO: THere's still a bunch of properties that don't exist in this use that need to be mapped somehow. + internal class UmbracoMembershipMember : MembershipUser { private readonly IMember _member; @@ -21,5 +23,44 @@ namespace Umbraco.Core.Models.Membership get { return _member.Email; } set { _member.Email = value; } } + + public override object ProviderUserKey + { + get { return _member.Key; } + } + + public override System.DateTime CreationDate + { + get { return _member.CreateDate; } + } + + public override string UserName + { + get { return _member.Username; } + } + + public override string Comment + { + get { return _member.Comments; } + set { _member.Comments = value; } + } + + public override bool IsApproved + { + get { return _member.IsApproved; } + set { _member.IsApproved = value; } + } + + public override bool IsLockedOut + { + get { return _member.IsLockedOut; } + } + + public override System.DateTime LastLoginDate + { + get { return _member.LastLoginDate; } + set { _member.LastLoginDate = value; } + } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Membership/UserProfile.cs b/src/Umbraco.Core/Models/Membership/UserProfile.cs index 1e3ab541e7..61a0d68ba7 100644 --- a/src/Umbraco.Core/Models/Membership/UserProfile.cs +++ b/src/Umbraco.Core/Models/Membership/UserProfile.cs @@ -133,7 +133,7 @@ namespace Umbraco.Core.Models.Membership /// be flagged as dirty. /// /// - internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) + public override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties) { _addedSections.Clear(); _removedSections.Clear(); diff --git a/src/Umbraco.Web/Models/PagedResult.cs b/src/Umbraco.Core/Models/PagedResult.cs similarity index 95% rename from src/Umbraco.Web/Models/PagedResult.cs rename to src/Umbraco.Core/Models/PagedResult.cs index 6c2c764c6e..2e35da9a96 100644 --- a/src/Umbraco.Web/Models/PagedResult.cs +++ b/src/Umbraco.Core/Models/PagedResult.cs @@ -1,63 +1,63 @@ -using System; -using System.Collections.Generic; -using System.Runtime.Serialization; - -namespace Umbraco.Web.Models -{ - /// - /// Represents a paged result for a model collection - /// - /// - [DataContract(Name = "pagedCollection", Namespace = "")] - public class PagedResult - { - public PagedResult(long totalItems, long pageNumber, long pageSize) - { - TotalItems = totalItems; - PageNumber = pageNumber; - PageSize = pageSize; - - if (pageSize > 0) - { - TotalPages = (long) Math.Ceiling(totalItems/(Decimal) pageSize); - } - else - { - TotalPages = 1; - } - } - - [DataMember(Name = "pageNumber")] - public long PageNumber { get; private set; } - - [DataMember(Name = "pageSize")] - public long PageSize { get; private set; } - - [DataMember(Name = "totalPages")] - public long TotalPages { get; private set; } - - [DataMember(Name = "totalItems")] - public long TotalItems { get; private set; } - - [DataMember(Name = "items")] - public IEnumerable Items { get; set; } - - /// - /// Calculates the skip size based on the paged parameters specified - /// - /// - /// Returns 0 if the page number or page size is zero - /// - internal int SkipSize - { - get - { - if (PageNumber > 0 && PageSize > 0) - { - return Convert.ToInt32((PageNumber - 1)*PageSize); - } - return 0; - } - } - } +using System; +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace Umbraco.Core.Models +{ + /// + /// Represents a paged result for a model collection + /// + /// + [DataContract(Name = "pagedCollection", Namespace = "")] + public class PagedResult + { + public PagedResult(long totalItems, long pageNumber, long pageSize) + { + TotalItems = totalItems; + PageNumber = pageNumber; + PageSize = pageSize; + + if (pageSize > 0) + { + TotalPages = (long) Math.Ceiling(totalItems/(Decimal) pageSize); + } + else + { + TotalPages = 1; + } + } + + [DataMember(Name = "pageNumber")] + public long PageNumber { get; private set; } + + [DataMember(Name = "pageSize")] + public long PageSize { get; private set; } + + [DataMember(Name = "totalPages")] + public long TotalPages { get; private set; } + + [DataMember(Name = "totalItems")] + public long TotalItems { get; private set; } + + [DataMember(Name = "items")] + public IEnumerable Items { get; set; } + + /// + /// Calculates the skip size based on the paged parameters specified + /// + /// + /// Returns 0 if the page number or page size is zero + /// + internal int SkipSize + { + get + { + if (PageNumber > 0 && PageSize > 0) + { + return Convert.ToInt32((PageNumber - 1)*PageSize); + } + return 0; + } + } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Factories/IEntityFactory.cs b/src/Umbraco.Core/Persistence/Factories/IEntityFactory.cs index 6053090178..a0d8823d68 100644 --- a/src/Umbraco.Core/Persistence/Factories/IEntityFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/IEntityFactory.cs @@ -1,5 +1,7 @@ namespace Umbraco.Core.Persistence.Factories { + //TODO: Not sure why we need this interface as it's never referenced in code. + internal interface IEntityFactory where TEntity : class where TDto : class diff --git a/src/Umbraco.Core/Persistence/IDatabaseFactory.cs b/src/Umbraco.Core/Persistence/IDatabaseFactory.cs index 87c146fa0f..b0efb7f94a 100644 --- a/src/Umbraco.Core/Persistence/IDatabaseFactory.cs +++ b/src/Umbraco.Core/Persistence/IDatabaseFactory.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Persistence /// /// Used to create the UmbracoDatabase for use in the DatabaseContext /// - internal interface IDatabaseFactory : IDisposable + public interface IDatabaseFactory : IDisposable { UmbracoDatabase CreateDatabase(); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs index 9dab3920e9..7dffece05a 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs @@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven .ForeignColumn("propertyTypeId") .ToTable("cmsPropertyType") .PrimaryColumn("id") - .OnDelete(Rule.Cascade) + .OnDelete(Rule.None) .OnUpdate(Rule.None); //now we need to add a foreign key to the nodeId column to cmsContent (intead of the original umbracoNode) @@ -109,7 +109,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven .ForeignColumn("nodeId") .ToTable("cmsContent") .PrimaryColumn("nodeId") - .OnDelete(Rule.Cascade) + .OnDelete(Rule.None) .OnUpdate(Rule.None); } diff --git a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs index eb10bf7f87..f249ca4577 100644 --- a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs +++ b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; +using System.Text.RegularExpressions; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.DatabaseModelDefinitions; @@ -17,6 +18,19 @@ namespace Umbraco.Core.Persistence internal static event CreateTableEventHandler NewTable; + /// + /// This will escape single @ symbols for peta poco values so it doesn't think it's a parameter + /// + /// + /// + /// + public static string EscapeAtSymbols(this Database db, string value) + { + //this fancy regex will only match a single @ not a double, etc... + var regex = new Regex("(?(this Database db) where T : new() { diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs index db9a1b4f19..895124f363 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs @@ -11,5 +11,6 @@ namespace Umbraco.Core.Persistence.Repositories /// /// IEnumerable GetByMemberGroup(string groupName); + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 8854f169cd..6175c2d494 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -265,8 +265,10 @@ namespace Umbraco.Core.Persistence.Repositories //Updates Modified date ((Member)entity).UpdatingEntity(); + var dirtyEntity = (ICanBeDirty) entity; + //Look up parent to get and set the correct Path and update SortOrder if ParentId has changed - if (((ICanBeDirty)entity).IsPropertyDirty("ParentId")) + if (dirtyEntity.IsPropertyDirty("ParentId")) { var parent = Database.First("WHERE id = @ParentId", new { ParentId = ((IUmbracoEntity)entity).ParentId }); ((IUmbracoEntity)entity).Path = string.Concat(parent.Path, ",", entity.Id); @@ -302,17 +304,44 @@ namespace Umbraco.Core.Persistence.Repositories //Updates the current version - cmsContentVersion //Assumes a Version guid exists and Version date (modified date) has been set/updated Database.Update(dto.ContentVersionDto); - //Updates the cmsMember entry - Database.Update(dto); + + //Updates the cmsMember entry if it has changed + var changedCols = new List(); + if (dirtyEntity.IsPropertyDirty("Email")) + { + changedCols.Add("Email"); + } + if (dirtyEntity.IsPropertyDirty("Username")) + { + changedCols.Add("LoginName"); + } + // DO NOT update the password if it is null or empty + if (dirtyEntity.IsPropertyDirty("Password") && entity.Password.IsNullOrWhiteSpace() == false) + { + changedCols.Add("Password"); + } + //only update the changed cols + if (changedCols.Count > 0) + { + Database.Update(dto, changedCols); + } //TODO ContentType for the Member entity //Create the PropertyData for this version - cmsPropertyData - var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id); - var propertyDataDtos = propertyFactory.BuildDto(((Member)entity).Properties); + var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id); var keyDictionary = new Dictionary(); //Add Properties + // - don't try to save the property if it doesn't exist (or doesn't have an ID) on the content type + // - this can occur if the member type doesn't contain the built-in properties that the + // - member object contains. + var existingProperties = entity.Properties + .Where(property => entity.ContentType.PropertyTypes.Any(x => x.Alias == property.Alias && x.HasIdentity)) + .ToList(); + + var propertyDataDtos = propertyFactory.BuildDto(existingProperties); + foreach (var propertyDataDto in propertyDataDtos) { if (propertyDataDto.Id > 0) @@ -337,7 +366,7 @@ namespace Umbraco.Core.Persistence.Repositories UpdatePropertyTags(entity, _tagRepository); - ((ICanBeDirty)entity).ResetDirtyProperties(); + dirtyEntity.ResetDirtyProperties(); } protected override void PersistDeletedItem(IMember entity) diff --git a/src/Umbraco.Core/Persistence/RepositoryFactory.cs b/src/Umbraco.Core/Persistence/RepositoryFactory.cs index 89d04bf4e7..f502e28d32 100644 --- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs +++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs @@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence } - internal RepositoryFactory(bool disableAllCache) + public RepositoryFactory(bool disableAllCache) : this(disableAllCache, UmbracoConfig.For.UmbracoSettings()) { diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs index fabcb7fe98..2104841349 100644 --- a/src/Umbraco.Core/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs @@ -40,6 +40,7 @@ using System.Security.Permissions; [assembly: InternalsVisibleTo("Concorde.Sync")] [assembly: InternalsVisibleTo("Umbraco.Belle")] [assembly: InternalsVisibleTo("Umbraco.VisualStudio")] +[assembly: InternalsVisibleTo("umbraco.providers")] //allow this to be mocked in our unit tests [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/src/Umbraco.Core/PropertyEditors/EmailValidator.cs b/src/Umbraco.Core/PropertyEditors/EmailValidator.cs new file mode 100644 index 0000000000..0fb6a227be --- /dev/null +++ b/src/Umbraco.Core/PropertyEditors/EmailValidator.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Umbraco.Core.Models; + +namespace Umbraco.Core.PropertyEditors +{ + /// + /// A validator that validates an email address + /// + [ValueValidator("Email")] + internal sealed class EmailValidator : ManifestValueValidator, IPropertyValidator + { + public override IEnumerable Validate(object value, string config, PreValueCollection preValues, PropertyEditor editor) + { + var asString = value.ToString(); + + var emailVal = new EmailAddressAttribute(); + + if (emailVal.IsValid(asString) == false) + { + //TODO: localize these! + yield return new ValidationResult("Email is invalid", new[] { "value" }); + } + } + + public IEnumerable Validate(object value, PreValueCollection preValues, PropertyEditor editor) + { + return Validate(value, null, preValues, editor); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs b/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs new file mode 100644 index 0000000000..cfa7174aae --- /dev/null +++ b/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; + +namespace Umbraco.Core.PropertyEditors +{ + public interface IParameterEditor + { + /// + /// The id of the property editor + /// + string Alias { get; } + + /// + /// The name of the property editor + /// + string Name { get; } + + /// + /// Allows a parameter editor to be re-used based on the configuration specified. + /// + IDictionary Configuration { get; } + + IValueEditor ValueEditor { get; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditor.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditor.cs index 189fd59b8a..be98218808 100644 --- a/src/Umbraco.Core/PropertyEditors/ParameterEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/ParameterEditor.cs @@ -5,26 +5,6 @@ using Umbraco.Core.IO; namespace Umbraco.Core.PropertyEditors { - public interface IParameterEditor - { - /// - /// The id of the property editor - /// - string Alias { get; } - - /// - /// The name of the property editor - /// - string Name { get; } - - /// - /// Allows a parameter editor to be re-used based on the configuration specified. - /// - IDictionary Configuration { get; } - - IValueEditor ValueEditor { get; } - } - /// /// Basic definition of a macro parameter editor /// diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditor.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditor.cs index 611f180758..cdc38f7cc2 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyEditor.cs @@ -116,6 +116,7 @@ namespace Umbraco.Core.PropertyEditors editor.View = _attribute.EditorView; editor.ValueType = _attribute.ValueType; + editor.HideLabel = _attribute.HideLabel; return editor; } diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs index 50dfd1d062..714ff31abd 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs @@ -52,5 +52,10 @@ namespace Umbraco.Core.PropertyEditors public string EditorView { get; private set; } public string ValueType { get; set; } public bool IsParameterEditor { get; set; } + + /// + /// If this is is true than the editor will be displayed full width without a label + /// + public bool HideLabel { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs index 0649a03d40..ec4cd52284 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs @@ -123,6 +123,12 @@ namespace Umbraco.Core.PropertyEditors } } + /// + /// If this is is true than the editor will be displayed full width without a label + /// + [JsonProperty("hideLabel")] + public bool HideLabel { get; set; } + /// /// Set this to true if the property editor is for display purposes only /// diff --git a/src/Umbraco.Core/Publishing/PublishStatus.cs b/src/Umbraco.Core/Publishing/PublishStatus.cs index aee9a1fafe..865f00c58c 100644 --- a/src/Umbraco.Core/Publishing/PublishStatus.cs +++ b/src/Umbraco.Core/Publishing/PublishStatus.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Publishing /// /// The result of publishing a content item /// - internal class PublishStatus + public class PublishStatus { public PublishStatus() { diff --git a/src/Umbraco.Core/Publishing/PublishStatusType.cs b/src/Umbraco.Core/Publishing/PublishStatusType.cs index c3cb76e245..0d9ffcfa02 100644 --- a/src/Umbraco.Core/Publishing/PublishStatusType.cs +++ b/src/Umbraco.Core/Publishing/PublishStatusType.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Publishing /// /// Anything less than 10 = Success! /// - internal enum PublishStatusType + public enum PublishStatusType { /// /// The publishing was successful. diff --git a/src/Umbraco.Core/Services/ApplicationTreeService.cs b/src/Umbraco.Core/Services/ApplicationTreeService.cs index 33a86fa070..dbf5c9b85a 100644 --- a/src/Umbraco.Core/Services/ApplicationTreeService.cs +++ b/src/Umbraco.Core/Services/ApplicationTreeService.cs @@ -12,7 +12,7 @@ using File = System.IO.File; namespace Umbraco.Core.Services { - internal class ApplicationTreeService + internal class ApplicationTreeService : IApplicationTreeService { private readonly CacheHelper _cache; @@ -95,6 +95,26 @@ namespace Umbraco.Core.Services }); } + public void Intitialize(IEnumerable existingTrees) + { + LoadXml(doc => + { + foreach (var tree in existingTrees) + { + doc.Root.Add(new XElement("add", + new XAttribute("initialize", tree.Initialize), + new XAttribute("sortOrder", tree.SortOrder), + new XAttribute("alias", tree.Alias), + new XAttribute("application", tree.ApplicationAlias), + new XAttribute("title", tree.Title), + new XAttribute("iconClosed", tree.IconClosed), + new XAttribute("iconOpen", tree.IconOpened), + new XAttribute("type", tree.Type))); + } + + }, true); + } + /// /// Creates a new application tree. /// @@ -205,14 +225,14 @@ namespace Umbraco.Core.Services /// Gets the application tree for the applcation with the specified alias /// /// The application alias. - /// + /// /// Returns a ApplicationTree Array - public IEnumerable GetApplicationTrees(string applicationAlias, bool onlyInitializedApplications) + public IEnumerable GetApplicationTrees(string applicationAlias, bool onlyInitialized) { var list = GetAppTrees().FindAll( t => { - if (onlyInitializedApplications) + if (onlyInitialized) return (t.ApplicationAlias == applicationAlias && t.Initialize); return (t.ApplicationAlias == applicationAlias); } diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index d4437a5000..1df2133891 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -237,7 +237,7 @@ namespace Umbraco.Core.Services /// /// Ids of the Content to retrieve /// - internal IEnumerable GetByIds(IEnumerable ids) + public IEnumerable GetByIds(IEnumerable ids) { using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork())) { @@ -627,28 +627,53 @@ namespace Umbraco.Core.Services /// The to publish /// Optional Id of the User issueing the publishing /// True if publishing succeeded, otherwise False + [Obsolete("Use PublishWithStatus instead, that method will provide more detailed information on the outcome")] public bool Publish(IContent content, int userId = 0) { var result = SaveAndPublishDo(content, userId); return result.Success; } + /// + /// Publishes a single object + /// + /// The to publish + /// Optional Id of the User issueing the publishing + /// True if publishing succeeded, otherwise False + public Attempt PublishWithStatus(IContent content, int userId = 0) + { + return SaveAndPublishDo(content, userId); + } + /// /// Publishes a object and all its children /// /// The to publish along with its children /// Optional Id of the User issueing the publishing /// True if publishing succeeded, otherwise False + [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")] public bool PublishWithChildren(IContent content, int userId = 0) { var result = PublishWithChildrenDo(content, userId, true); - + //This used to just return false only when the parent content failed, otherwise would always return true so we'll // do the same thing for the moment - if (!result.Any(x => x.Result.ContentItem.Id == content.Id)) - return false; + if (!result.Any(x => x.Result.ContentItem.Id == content.Id)) + return false; - return result.Single(x => x.Result.ContentItem.Id == content.Id).Success; + return result.Single(x => x.Result.ContentItem.Id == content.Id).Success; + } + + /// + /// Publishes a object and all its children + /// + /// The to publish along with its children + /// Optional Id of the User issueing the publishing + /// set to true if you want to also publish children that are currently unpublished + /// True if publishing succeeded, otherwise False + public IEnumerable> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false) + { + return PublishWithChildrenDo(content, userId, includeUnpublished); } /// @@ -669,12 +694,25 @@ namespace Umbraco.Core.Services /// Optional Id of the User issueing the publishing /// Optional boolean indicating whether or not to raise save events. /// True if publishing succeeded, otherwise False + [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")] public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true) { var result = SaveAndPublishDo(content, userId, raiseEvents); return result.Success; } + /// + /// Saves and Publishes a single object + /// + /// The to save and publish + /// Optional Id of the User issueing the publishing + /// Optional boolean indicating whether or not to raise save events. + /// True if publishing succeeded, otherwise False + public Attempt SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true) + { + return SaveAndPublishDo(content, userId, raiseEvents); + } + /// /// Saves a single object /// @@ -1329,42 +1367,30 @@ namespace Umbraco.Core.Services } #region Internal Methods - - /// - /// Internal method that Publishes a single object for legacy purposes. - /// - /// The to publish - /// Optional Id of the User issueing the publishing - /// True if publishing succeeded, otherwise False - internal Attempt PublishInternal(IContent content, int userId = 0) - { - return SaveAndPublishDo(content, userId); - } - /// - /// Internal method that Publishes a object and all its children for legacy purposes. - /// - /// The to publish along with its children - /// Optional Id of the User issueing the publishing - /// If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published - /// True if publishing succeeded, otherwise False - internal IEnumerable> PublishWithChildrenInternal( - IContent content, int userId = 0, bool includeUnpublished = false) - { - return PublishWithChildrenDo(content, userId, includeUnpublished); - } + ///// + ///// Internal method that Publishes a single object for legacy purposes. + ///// + ///// The to publish + ///// Optional Id of the User issueing the publishing + ///// True if publishing succeeded, otherwise False + //internal Attempt PublishInternal(IContent content, int userId = 0) + //{ + // return SaveAndPublishDo(content, userId); + //} - /// - /// Saves and Publishes a single object - /// - /// The to save and publish - /// Optional Id of the User issueing the publishing - /// Optional boolean indicating whether or not to raise save events. - /// True if publishing succeeded, otherwise False - internal Attempt SaveAndPublishInternal(IContent content, int userId = 0, bool raiseEvents = true) - { - return SaveAndPublishDo(content, userId, raiseEvents); - } + ///// + ///// Internal method that Publishes a object and all its children for legacy purposes. + ///// + ///// The to publish along with its children + ///// Optional Id of the User issueing the publishing + ///// If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published + ///// True if publishing succeeded, otherwise False + //internal IEnumerable> PublishWithChildrenInternal( + // IContent content, int userId = 0, bool includeUnpublished = false) + //{ + // return PublishWithChildrenDo(content, userId, includeUnpublished); + //} /// /// Gets a collection of descendants by the first Parent. @@ -1462,7 +1488,7 @@ namespace Umbraco.Core.Services /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that /// are to be published. /// - private IEnumerable> PublishWithChildrenDo( + private IEnumerable> PublishWithChildrenDo( IContent content, int userId = 0, bool includeUnpublished = false) { if (content == null) throw new ArgumentNullException("content"); diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs index afd7da9efe..a2f27f58a2 100644 --- a/src/Umbraco.Core/Services/ContentTypeService.cs +++ b/src/Umbraco.Core/Services/ContentTypeService.cs @@ -346,36 +346,7 @@ namespace Umbraco.Core.Services Audit.Add(AuditTypes.Delete, string.Format("Delete ContentTypes performed by user"), userId, -1); } } - - /// - /// Gets an object by its Id - /// - /// Id of the to retrieve - /// - public IMemberType GetMemberType(int id) - { - using (var repository = _repositoryFactory.CreateMemberTypeRepository(_uowProvider.GetUnitOfWork())) - { - return repository.Get(id); - } - } - - /// - /// Gets an object by its Alias - /// - /// Alias of the to retrieve - /// - public IMemberType GetMemberType(string alias) - { - using (var repository = _repositoryFactory.CreateMemberTypeRepository(_uowProvider.GetUnitOfWork())) - { - var query = Query.Builder.Where(x => x.Alias == alias); - var contentTypes = repository.GetByQuery(query); - - return contentTypes.FirstOrDefault(); - } - } - + /// /// Gets an object by its Id /// diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index f41ac769fa..230d01cbde 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -127,25 +127,7 @@ namespace Umbraco.Core.Services return list; } } - - /// - /// Gets all prevalues for an - /// - /// - /// This method should be kept internal until a proper PreValue object model is introduced. - /// - /// Id of the to retrieve prevalues from - /// An enumerable list of Tuples containing Id, Alias, SortOrder, Value - internal IEnumerable> GetDetailedPreValuesByDataTypeId(int id) - { - using (var uow = _uowProvider.GetUnitOfWork()) - { - var dtos = uow.Database.Fetch("WHERE datatypeNodeId = @Id", new { Id = id }); - var list = dtos.Select(x => new Tuple(x.Id, x.Alias, x.SortOrder, x.Value)).ToList(); - return list; - } - } - + /// /// Returns the PreValueCollection for the specified data type /// @@ -313,7 +295,7 @@ namespace Umbraco.Core.Services /// /// /// - internal void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary values, int userId = 0) + public void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary values, int userId = 0) { if (Saving.IsRaisedEventCancelled(new SaveEventArgs(dataTypeDefinition), this)) return; diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs index 882aa86b4e..7e103c687b 100644 --- a/src/Umbraco.Core/Services/EntityService.cs +++ b/src/Umbraco.Core/Services/EntityService.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Persistence.UnitOfWork; namespace Umbraco.Core.Services { - public class EntityService : IService + public class EntityService : IService, IEntityService { private readonly IDatabaseUnitOfWorkProvider _uowProvider; private readonly RepositoryFactory _repositoryFactory; diff --git a/src/Umbraco.Core/Services/IApplicationTreeService.cs b/src/Umbraco.Core/Services/IApplicationTreeService.cs new file mode 100644 index 0000000000..bb7bb0f790 --- /dev/null +++ b/src/Umbraco.Core/Services/IApplicationTreeService.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using Umbraco.Core.Models; + +namespace Umbraco.Core.Services +{ + public interface IApplicationTreeService + { + void Intitialize(IEnumerable existingTrees); + + /// + /// Creates a new application tree. + /// + /// if set to true [initialize]. + /// The sort order. + /// The application alias. + /// The alias. + /// The title. + /// The icon closed. + /// The icon opened. + /// The type. + void MakeNew(bool initialize, byte sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type); + + /// + /// Saves this instance. + /// + void SaveTree(ApplicationTree tree); + + /// + /// Deletes this instance. + /// + void DeleteTree(ApplicationTree tree); + + /// + /// Gets an ApplicationTree by it's tree alias. + /// + /// The tree alias. + /// An ApplicationTree instance + ApplicationTree GetByAlias(string treeAlias); + + /// + /// Gets all applicationTrees registered in umbraco from the umbracoAppTree table.. + /// + /// Returns a ApplicationTree Array + IEnumerable GetAll(); + + /// + /// Gets the application tree for the applcation with the specified alias + /// + /// The application alias. + /// Returns a ApplicationTree Array + IEnumerable GetApplicationTrees(string applicationAlias); + + /// + /// Gets the application tree for the applcation with the specified alias + /// + /// The application alias. + /// + /// Returns a ApplicationTree Array + IEnumerable GetApplicationTrees(string applicationAlias, bool onlyInitialized); + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs index c954219dbf..a265b15092 100644 --- a/src/Umbraco.Core/Services/IContentService.cs +++ b/src/Umbraco.Core/Services/IContentService.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; +using Umbraco.Core.Publishing; namespace Umbraco.Core.Services { @@ -10,7 +11,9 @@ namespace Umbraco.Core.Services /// public interface IContentService : IService { - + + IEnumerable GetByIds(IEnumerable ids); + /// /// Creates an object using the alias of the /// that this Content should based on. @@ -244,16 +247,35 @@ namespace Umbraco.Core.Services /// The to publish /// Optional Id of the User issueing the publishing /// True if publishing succeeded, otherwise False + [Obsolete("Use PublishWithStatus instead, that method will provide more detailed information on the outcome")] bool Publish(IContent content, int userId = 0); + /// + /// Publishes a single object + /// + /// The to publish + /// Optional Id of the User issueing the publishing + /// The published status attempt + Attempt PublishWithStatus(IContent content, int userId = 0); + /// /// Publishes a object and all its children /// /// The to publish along with its children /// Optional Id of the User issueing the publishing /// True if publishing succeeded, otherwise False + [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")] bool PublishWithChildren(IContent content, int userId = 0); + /// + /// Publishes a object and all its children + /// + /// The to publish along with its children + /// Optional Id of the User issueing the publishing + /// + /// The list of statuses for all published items + IEnumerable> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false); + /// /// UnPublishes a single object /// @@ -269,8 +291,18 @@ namespace Umbraco.Core.Services /// Optional Id of the User issueing the publishing /// Optional boolean indicating whether or not to raise save events. /// True if publishing succeeded, otherwise False + [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")] bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true); + /// + /// Saves and Publishes a single object + /// + /// The to save and publish + /// Optional Id of the User issueing the publishing + /// Optional boolean indicating whether or not to raise save events. + /// True if publishing succeeded, otherwise False + Attempt SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true); + /// /// Permanently deletes an object. /// diff --git a/src/Umbraco.Core/Services/IContentTypeService.cs b/src/Umbraco.Core/Services/IContentTypeService.cs index 9f596e465e..9e7c8d53f9 100644 --- a/src/Umbraco.Core/Services/IContentTypeService.cs +++ b/src/Umbraco.Core/Services/IContentTypeService.cs @@ -66,21 +66,7 @@ namespace Umbraco.Core.Services /// Deleting a will delete all the objects based on this /// Optional Id of the User deleting the ContentTypes void Delete(IEnumerable contentTypes, int userId = 0); - - /// - /// Gets an object by its Id - /// - /// Id of the to retrieve - /// - IMemberType GetMemberType(int id); - - /// - /// Gets an object by its Alias - /// - /// Alias of the to retrieve - /// - IMemberType GetMemberType(string alias); - + /// /// Gets an object by its Id /// diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs index 6df168d9d3..9b6f23bce3 100644 --- a/src/Umbraco.Core/Services/IDataTypeService.cs +++ b/src/Umbraco.Core/Services/IDataTypeService.cs @@ -10,6 +10,8 @@ namespace Umbraco.Core.Services /// public interface IDataTypeService : IService { + void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary values, int userId = 0); + /// /// Gets a by its Id /// diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs new file mode 100644 index 0000000000..c32d755c3f --- /dev/null +++ b/src/Umbraco.Core/Services/IEntityService.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using Umbraco.Core.Models; +using Umbraco.Core.Models.EntityBase; + +namespace Umbraco.Core.Services +{ + public interface IEntityService + { + /// + /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph. + /// + /// + /// By default this will load the base type with a minimum set of properties. + /// + /// Id of the object to retrieve + /// Optional bool to load the complete object graph when set to False. + /// An + IUmbracoEntity Get(int id, bool loadBaseType = true); + + /// + /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph. + /// + /// + /// By default this will load the base type with a minimum set of properties. + /// + /// Id of the object to retrieve + /// UmbracoObjectType of the entity to retrieve + /// Optional bool to load the complete object graph when set to False. + /// An + IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true); + + /// + /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph. + /// + /// + /// By default this will load the base type with a minimum set of properties. + /// + /// Type of the model to retrieve. Must be based on an + /// Id of the object to retrieve + /// Optional bool to load the complete object graph when set to False. + /// An + IUmbracoEntity Get(int id, bool loadBaseType = true) where T : IUmbracoEntity; + + /// + /// Gets the parent of entity by its id + /// + /// Id of the entity to retrieve the Parent for + /// An + IUmbracoEntity GetParent(int id); + + /// + /// Gets the parent of entity by its id and UmbracoObjectType + /// + /// Id of the entity to retrieve the Parent for + /// UmbracoObjectType of the parent to retrieve + /// An + IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType); + + /// + /// Gets a collection of children by the parents Id + /// + /// Id of the parent to retrieve children for + /// An enumerable list of objects + IEnumerable GetChildren(int parentId); + + /// + /// Gets a collection of children by the parents Id and UmbracoObjectType + /// + /// Id of the parent to retrieve children for + /// UmbracoObjectType of the children to retrieve + /// An enumerable list of objects + IEnumerable GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType); + + /// + /// Gets a collection of descendents by the parents Id + /// + /// Id of entity to retrieve descendents for + /// An enumerable list of objects + IEnumerable GetDescendents(int id); + + /// + /// Gets a collection of descendents by the parents Id + /// + /// Id of entity to retrieve descendents for + /// UmbracoObjectType of the descendents to retrieve + /// An enumerable list of objects + IEnumerable GetDescendents(int id, UmbracoObjectTypes umbracoObjectType); + + /// + /// Gets a collection of the entities at the root, which corresponds to the entities with a Parent Id of -1. + /// + /// UmbracoObjectType of the root entities to retrieve + /// An enumerable list of objects + IEnumerable GetRootEntities(UmbracoObjectTypes umbracoObjectType); + + /// + /// Gets a collection of all of a given type. + /// + /// Type of the entities to retrieve + /// An enumerable list of objects + IEnumerable GetAll() where T : IUmbracoEntity; + + /// + /// Gets a collection of all of a given type. + /// + /// UmbracoObjectType of the entities to return + /// An enumerable list of objects + IEnumerable GetAll(UmbracoObjectTypes umbracoObjectType); + + /// + /// Gets a collection of + /// + /// Guid id of the UmbracoObjectType + /// An enumerable list of objects + IEnumerable GetAll(Guid objectTypeId); + + /// + /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity. + /// + /// Id of the entity + /// + UmbracoObjectTypes GetObjectType(int id); + + /// + /// Gets the UmbracoObjectType from an IUmbracoEntity. + /// + /// + /// + UmbracoObjectTypes GetObjectType(IUmbracoEntity entity); + + /// + /// Gets the Type of an entity by its Id + /// + /// Id of the entity + /// Type of the entity + Type GetEntityType(int id); + + /// + /// Gets the Type of an entity by its + /// + /// + /// Type of the entity + Type GetEntityType(UmbracoObjectTypes umbracoObjectType); + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs index c8b9db6967..a8eb2dcae6 100644 --- a/src/Umbraco.Core/Services/IMediaService.cs +++ b/src/Umbraco.Core/Services/IMediaService.cs @@ -9,6 +9,8 @@ namespace Umbraco.Core.Services /// public interface IMediaService : IService { + IEnumerable GetByIds(IEnumerable ids); + /// /// Creates an object using the alias of the /// that this Media should based on. diff --git a/src/Umbraco.Core/Services/IMemberService.cs b/src/Umbraco.Core/Services/IMemberService.cs index 737e142c3b..c01a80fb9f 100644 --- a/src/Umbraco.Core/Services/IMemberService.cs +++ b/src/Umbraco.Core/Services/IMemberService.cs @@ -14,7 +14,7 @@ namespace Umbraco.Core.Services IEnumerable GetMembersByMemberType(string memberTypeAlias); IEnumerable GetMembersByGroup(string memberGroupName); IEnumerable GetAllMembers(params int[] ids); - + //TODO: Need to get all members that start with a certain letter } @@ -37,5 +37,7 @@ namespace Umbraco.Core.Services void Delete(IMember membershipUser); void Save(IMember membershipUser); + + IEnumerable FindMembersByEmail(string emailStringToMatch); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Services/IMemberTypeService.cs b/src/Umbraco.Core/Services/IMemberTypeService.cs index 9c45d83e68..7857e1dda0 100644 --- a/src/Umbraco.Core/Services/IMemberTypeService.cs +++ b/src/Umbraco.Core/Services/IMemberTypeService.cs @@ -12,7 +12,18 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects IEnumerable GetAllMemberTypes(params int[] ids); - IMemberType GetMemberType(string alias); + /// + /// Gets an object by its Id + /// + /// Id of the to retrieve + /// IMemberType GetMemberType(int id); + + /// + /// Gets an object by its Alias + /// + /// Alias of the to retrieve + /// + IMemberType GetMemberType(string alias); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Services/ISectionService.cs b/src/Umbraco.Core/Services/ISectionService.cs new file mode 100644 index 0000000000..1df38977f0 --- /dev/null +++ b/src/Umbraco.Core/Services/ISectionService.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; +using Umbraco.Core.Models; + +namespace Umbraco.Core.Services +{ + public interface ISectionService + { + /// + /// Ensures all available sections exist in the storage medium + /// + /// + void Initialize(IEnumerable
existingSections); + + /// + /// The cache storage for all applications + /// + IEnumerable
GetSections(); + + /// + /// Get the user's allowed sections + /// + /// + /// + IEnumerable
GetAllowedSections(int userId); + + /// + /// Gets the application by its alias. + /// + /// The application alias. + /// + Section GetByAlias(string appAlias); + + /// + /// Creates a new applcation if no application with the specified alias is found. + /// + /// The application name. + /// The application alias. + /// The application icon, which has to be located in umbraco/images/tray folder. + void MakeNew(string name, string alias, string icon); + + /// + /// Makes the new. + /// + /// The name. + /// The alias. + /// The icon. + /// The sort order. + void MakeNew(string name, string alias, string icon, int sortOrder); + + /// + /// Deletes the section + /// + void DeleteSection(Section section); + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs index f6a42aea9b..57b943b711 100644 --- a/src/Umbraco.Core/Services/MediaService.cs +++ b/src/Umbraco.Core/Services/MediaService.cs @@ -211,7 +211,7 @@ namespace Umbraco.Core.Services ///
/// Ids of the Media to retrieve /// - internal IEnumerable GetByIds(IEnumerable ids) + public IEnumerable GetByIds(IEnumerable ids) { using (var repository = _repositoryFactory.CreateMediaRepository(_uowProvider.GetUnitOfWork())) { diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs index 914ef70e60..87eee84863 100644 --- a/src/Umbraco.Core/Services/MemberService.cs +++ b/src/Umbraco.Core/Services/MemberService.cs @@ -108,6 +108,25 @@ namespace Umbraco.Core.Services } } + /// + /// Does a search for members that contain the specified string in their email address + /// + /// + /// + public IEnumerable FindMembersByEmail(string emailStringToMatch) + { + var uow = _uowProvider.GetUnitOfWork(); + using (var repository = _repositoryFactory.CreateMemberRepository(uow)) + { + var query = new Query(); + + + query.Where(member => member.Email.Contains(emailStringToMatch)); + + return repository.GetByQuery(query); + } + } + /// /// Gets a list of Members with a certain string property value /// diff --git a/src/Umbraco.Core/Services/MemberTypeService.cs b/src/Umbraco.Core/Services/MemberTypeService.cs index cc5eada678..81a231f7c5 100644 --- a/src/Umbraco.Core/Services/MemberTypeService.cs +++ b/src/Umbraco.Core/Services/MemberTypeService.cs @@ -37,17 +37,11 @@ namespace Umbraco.Core.Services } } - public IMemberType GetMemberType(string alias) - { - using (var repository = _repositoryFactory.CreateMemberTypeRepository(_uowProvider.GetUnitOfWork())) - { - var query = Query.Builder.Where(x => x.Alias == alias); - var memberTypes = repository.GetByQuery(query); - - return memberTypes.FirstOrDefault(); - } - } - + /// + /// Gets an object by its Id + /// + /// Id of the to retrieve + /// public IMemberType GetMemberType(int id) { using (var repository = _repositoryFactory.CreateMemberTypeRepository(_uowProvider.GetUnitOfWork())) @@ -56,5 +50,21 @@ namespace Umbraco.Core.Services } } + /// + /// Gets an object by its Alias + /// + /// Alias of the to retrieve + /// + public IMemberType GetMemberType(string alias) + { + using (var repository = _repositoryFactory.CreateMemberTypeRepository(_uowProvider.GetUnitOfWork())) + { + var query = Query.Builder.Where(x => x.Alias == alias); + var contentTypes = repository.GetByQuery(query); + + return contentTypes.FirstOrDefault(); + } + } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index 7d182e153e..001502ad34 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/src/Umbraco.Core/Services/PackagingService.cs @@ -729,15 +729,19 @@ namespace Umbraco.Core.Services { var prevalues = new XElement("PreValues"); - var prevalueList = ((DataTypeService)_dataTypeService).GetDetailedPreValuesByDataTypeId(dataTypeDefinition.Id); - foreach (var tuple in prevalueList) + var prevalueList = _dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id) + .FormatAsDictionary(); + + var sort = 0; + foreach (var pv in prevalueList) { var prevalue = new XElement("PreValue"); - prevalue.Add(new XAttribute("Id", tuple.Item1)); - prevalue.Add(new XAttribute("Value", tuple.Item4)); - prevalue.Add(new XAttribute("Alias", tuple.Item2)); - prevalue.Add(new XAttribute("SortOrder", tuple.Item3)); + prevalue.Add(new XAttribute("Id", pv.Value.Id)); + prevalue.Add(new XAttribute("Value", pv.Value.Value)); + prevalue.Add(new XAttribute("Alias", pv.Key)); + prevalue.Add(new XAttribute("SortOrder", sort)); prevalues.Add(prevalue); + sort++; } var xml = new XElement("DataType", prevalues); diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs index 83d09023ab..29a42da115 100644 --- a/src/Umbraco.Core/Services/RelationService.cs +++ b/src/Umbraco.Core/Services/RelationService.cs @@ -13,10 +13,10 @@ namespace Umbraco.Core.Services { private readonly IDatabaseUnitOfWorkProvider _uowProvider; private readonly RepositoryFactory _repositoryFactory; - private readonly EntityService _entityService; + private readonly IEntityService _entityService; public RelationService(IDatabaseUnitOfWorkProvider uowProvider, RepositoryFactory repositoryFactory, - EntityService entityService) + IEntityService entityService) { _uowProvider = uowProvider; _repositoryFactory = repositoryFactory; diff --git a/src/Umbraco.Core/Services/SectionService.cs b/src/Umbraco.Core/Services/SectionService.cs index aaca16c541..00fa28e38c 100644 --- a/src/Umbraco.Core/Services/SectionService.cs +++ b/src/Umbraco.Core/Services/SectionService.cs @@ -14,15 +14,15 @@ using File = System.IO.File; namespace Umbraco.Core.Services { - internal class SectionService + internal class SectionService : ISectionService { private readonly IUserService _userService; - private readonly ApplicationTreeService _applicationTreeService; + private readonly IApplicationTreeService _applicationTreeService; private readonly CacheHelper _cache; public SectionService( - IUserService userService, - ApplicationTreeService applicationTreeService, + IUserService userService, + IApplicationTreeService applicationTreeService, CacheHelper cache) { if (applicationTreeService == null) throw new ArgumentNullException("applicationTreeService"); @@ -56,10 +56,29 @@ namespace Umbraco.Core.Services set { _appConfig = value; } } + /// + /// Ensures all available sections exist in the storage medium + /// + /// + public void Initialize(IEnumerable
existingSections) + { + LoadXml(doc => + { + foreach (var attr in existingSections) + { + doc.Root.Add(new XElement("add", + new XAttribute("alias", attr.Alias), + new XAttribute("name", attr.Name), + new XAttribute("icon", attr.Icon), + new XAttribute("sortOrder", attr.SortOrder))); + } + }, true); + } + /// /// The cache storage for all applications /// - internal IEnumerable
GetSections() + public IEnumerable
GetSections() { return _cache.GetCacheItem( CacheKeys.ApplicationsCacheKey, diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs index ce5a974de8..1bfeeeb8ad 100644 --- a/src/Umbraco.Core/Services/ServiceContext.cs +++ b/src/Umbraco.Core/Services/ServiceContext.cs @@ -12,46 +12,86 @@ namespace Umbraco.Core.Services /// public class ServiceContext { - private Lazy _contentService; - private Lazy _userService; - private Lazy _memberService; - private Lazy _mediaService; - private Lazy _contentTypeService; - private Lazy _dataTypeService; - private Lazy _fileService; - private Lazy _localizationService; + private Lazy _contentService; + private Lazy _userService; + private Lazy _memberService; + private Lazy _mediaService; + private Lazy _contentTypeService; + private Lazy _dataTypeService; + private Lazy _fileService; + private Lazy _localizationService; private Lazy _packagingService; private Lazy _serverRegistrationService; - private Lazy _entityService; + private Lazy _entityService; private Lazy _relationService; - private Lazy _treeService; - private Lazy _sectionService; - private Lazy _macroService; - private Lazy _memberTypeService; + private Lazy _treeService; + private Lazy _sectionService; + private Lazy _macroService; + private Lazy _memberTypeService; - /// - /// Constructor - /// - /// - /// - /// + /// + /// public ctor - will generally just be used for unit testing + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public ServiceContext( + IContentService contentService, + IMediaService mediaService, + IContentTypeService contentTypeService, + IDataTypeService dataTypeService, + IFileService fileService, + ILocalizationService localizationService, + PackagingService packagingService, + IEntityService entityService, + RelationService relationService, + ISectionService sectionService, + IApplicationTreeService treeService) + { + _contentService = new Lazy(() => contentService); + _mediaService = new Lazy(() => mediaService); + _contentTypeService = new Lazy(() => contentTypeService); + _dataTypeService = new Lazy(() => dataTypeService); + _fileService = new Lazy(() => fileService); + _localizationService = new Lazy(() => localizationService); + _packagingService = new Lazy(() => packagingService); + _entityService = new Lazy(() => entityService); + _relationService = new Lazy(() => relationService); + _sectionService = new Lazy(() => sectionService); + _treeService = new Lazy(() => treeService); + } + + /// + /// Constructor used to instantiate the core services + /// + /// + /// + /// internal ServiceContext(IDatabaseUnitOfWorkProvider dbUnitOfWorkProvider, IUnitOfWorkProvider fileUnitOfWorkProvider, BasePublishingStrategy publishingStrategy, CacheHelper cache) - { + { BuildServiceCache(dbUnitOfWorkProvider, fileUnitOfWorkProvider, publishingStrategy, cache, - //this needs to be lazy because when we create the service context it's generally before the - //resolvers have been initialized! - new Lazy(() => RepositoryResolver.Current.Factory)); - } + //this needs to be lazy because when we create the service context it's generally before the + //resolvers have been initialized! + new Lazy(() => RepositoryResolver.Current.Factory)); + } /// /// Builds the various services /// - private void BuildServiceCache( - IDatabaseUnitOfWorkProvider dbUnitOfWorkProvider, - IUnitOfWorkProvider fileUnitOfWorkProvider, - BasePublishingStrategy publishingStrategy, + private void BuildServiceCache( + IDatabaseUnitOfWorkProvider dbUnitOfWorkProvider, + IUnitOfWorkProvider fileUnitOfWorkProvider, + BasePublishingStrategy publishingStrategy, CacheHelper cache, - Lazy repositoryFactory) + Lazy repositoryFactory) { var provider = dbUnitOfWorkProvider; var fileProvider = fileUnitOfWorkProvider; @@ -59,50 +99,50 @@ namespace Umbraco.Core.Services if (_serverRegistrationService == null) _serverRegistrationService = new Lazy(() => new ServerRegistrationService(provider, repositoryFactory.Value)); - if (_userService == null) - _userService = new Lazy(() => new UserService(provider, repositoryFactory.Value)); + if (_userService == null) + _userService = new Lazy(() => new UserService(provider, repositoryFactory.Value)); if (_memberService == null) - _memberService = new Lazy(() => new MemberService(provider, repositoryFactory.Value)); + _memberService = new Lazy(() => new MemberService(provider, repositoryFactory.Value)); if (_contentService == null) - _contentService = new Lazy(() => new ContentService(provider, repositoryFactory.Value, publishingStrategy)); + _contentService = new Lazy(() => new ContentService(provider, repositoryFactory.Value, publishingStrategy)); - if(_mediaService == null) - _mediaService = new Lazy(() => new MediaService(provider, repositoryFactory.Value)); + if (_mediaService == null) + _mediaService = new Lazy(() => new MediaService(provider, repositoryFactory.Value)); - if(_contentTypeService == null) - _contentTypeService = new Lazy(() => new ContentTypeService(provider, repositoryFactory.Value, _contentService.Value, _mediaService.Value)); + if (_contentTypeService == null) + _contentTypeService = new Lazy(() => new ContentTypeService(provider, repositoryFactory.Value, _contentService.Value, _mediaService.Value)); - if(_dataTypeService == null) - _dataTypeService = new Lazy(() => new DataTypeService(provider, repositoryFactory.Value)); + if (_dataTypeService == null) + _dataTypeService = new Lazy(() => new DataTypeService(provider, repositoryFactory.Value)); - if(_fileService == null) - _fileService = new Lazy(() => new FileService(fileProvider, provider, repositoryFactory.Value)); + if (_fileService == null) + _fileService = new Lazy(() => new FileService(fileProvider, provider, repositoryFactory.Value)); - if(_localizationService == null) - _localizationService = new Lazy(() => new LocalizationService(provider, repositoryFactory.Value)); + if (_localizationService == null) + _localizationService = new Lazy(() => new LocalizationService(provider, repositoryFactory.Value)); - if(_packagingService == null) + if (_packagingService == null) _packagingService = new Lazy(() => new PackagingService(_contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value, _fileService.Value, _localizationService.Value, repositoryFactory.Value, provider)); if (_entityService == null) - _entityService = new Lazy(() => new EntityService(provider, repositoryFactory.Value, _contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value)); + _entityService = new Lazy(() => new EntityService(provider, repositoryFactory.Value, _contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value)); - if(_relationService == null) + if (_relationService == null) _relationService = new Lazy(() => new RelationService(provider, repositoryFactory.Value, _entityService.Value)); if (_treeService == null) - _treeService = new Lazy(() => new ApplicationTreeService(cache)); + _treeService = new Lazy(() => new ApplicationTreeService(cache)); if (_sectionService == null) - _sectionService = new Lazy(() => new SectionService(_userService.Value, _treeService.Value, cache)); + _sectionService = new Lazy(() => new SectionService(_userService.Value, _treeService.Value, cache)); if (_macroService == null) - _macroService = new Lazy(() => new MacroService(provider, repositoryFactory.Value)); + _macroService = new Lazy(() => new MacroService(provider, repositoryFactory.Value)); if (_memberTypeService == null) - _memberTypeService = new Lazy(() => new MemberTypeService(provider, repositoryFactory.Value)); + _memberTypeService = new Lazy(() => new MemberTypeService(provider, repositoryFactory.Value)); } /// @@ -116,7 +156,7 @@ namespace Umbraco.Core.Services /// /// Gets the /// - internal MacroService MacroService + internal IMacroService MacroService { get { return _macroService.Value; } } @@ -124,7 +164,7 @@ namespace Umbraco.Core.Services /// /// Gets the /// - public EntityService EntityService + public IEntityService EntityService { get { return _entityService.Value; } } @@ -150,7 +190,7 @@ namespace Umbraco.Core.Services /// public IContentTypeService ContentTypeService { - get { return _contentTypeService.Value; } + get { return _contentTypeService.Value; } } /// @@ -158,7 +198,7 @@ namespace Umbraco.Core.Services /// public IDataTypeService DataTypeService { - get { return _dataTypeService.Value; } + get { return _dataTypeService.Value; } } /// @@ -166,7 +206,7 @@ namespace Umbraco.Core.Services /// public IFileService FileService { - get { return _fileService.Value; } + get { return _fileService.Value; } } /// @@ -174,7 +214,7 @@ namespace Umbraco.Core.Services /// public ILocalizationService LocalizationService { - get { return _localizationService.Value; } + get { return _localizationService.Value; } } /// @@ -182,7 +222,7 @@ namespace Umbraco.Core.Services /// public IMediaService MediaService { - get { return _mediaService.Value; } + get { return _mediaService.Value; } } /// @@ -198,7 +238,7 @@ namespace Umbraco.Core.Services /// internal IUserService UserService { - get { return _userService.Value; } + get { return _userService.Value; } } /// @@ -212,7 +252,7 @@ namespace Umbraco.Core.Services /// /// Gets the /// - internal SectionService SectionService + public ISectionService SectionService { get { return _sectionService.Value; } } @@ -220,7 +260,7 @@ namespace Umbraco.Core.Services /// /// Gets the /// - internal ApplicationTreeService ApplicationTreeService + internal IApplicationTreeService ApplicationTreeService { get { return _treeService.Value; } } @@ -228,9 +268,10 @@ namespace Umbraco.Core.Services /// /// Gets the MemberTypeService /// - internal MemberTypeService MemberTypeService + internal IMemberTypeService MemberTypeService { get { return _memberTypeService.Value; } } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 53ae287a88..e2db559396 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -60,9 +60,7 @@ ..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll - - ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.ComponentModel.DataAnnotations.dll - + @@ -383,6 +381,7 @@ + @@ -474,6 +473,8 @@ + + @@ -938,9 +939,11 @@ + + @@ -948,6 +951,7 @@ + diff --git a/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs b/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs index 679a55897a..45dd854f74 100644 --- a/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs +++ b/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs @@ -13,7 +13,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public class ContentControllerUnitTests { [Test] - public void Does_Not_Throw_Exception_When_Access_Allowed_By_Path() + public void Access_Allowed_By_Path() { //arrange var userMock = new Mock(); @@ -26,13 +26,9 @@ namespace Umbraco.Tests.Controllers.WebApiEditors var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; - var userServiceMock = new Mock(); - var permissions = new List(); - userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions); - var userService = userServiceMock.Object; //act - var result = ContentController.CheckPermissions(new Dictionary(), user, userService, contentService, 1234, 'F'); + var result = ContentController.CheckPermissions(new Dictionary(), user, null, contentService, 1234); //assert Assert.IsTrue(result); @@ -62,7 +58,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors } [Test] - public void Throws_Exception_When_No_Access_By_Path() + public void No_Access_By_Path() { //arrange var userMock = new Mock(); @@ -88,7 +84,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors } [Test] - public void Throws_Exception_When_No_Access_By_Permission() + public void No_Access_By_Permission() { //arrange var userMock = new Mock(); @@ -117,7 +113,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors } [Test] - public void Does_Not_Throw_Exception_When_Access_Allowed_By_Permission() + public void Access_Allowed_By_Permission() { //arrange var userMock = new Mock(); @@ -146,34 +142,166 @@ namespace Umbraco.Tests.Controllers.WebApiEditors } [Test] - public void Does_Not_Throw_Exception_When_No_Permissions_Assigned() + public void Access_To_Root_By_Path() { //arrange var userMock = new Mock(); - userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.Id).Returns(0); userMock.Setup(u => u.StartContentId).Returns(-1); var user = userMock.Object; - var contentMock = new Mock(); - contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); - var content = contentMock.Object; - var contentServiceMock = new Mock(); - contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); - var contentService = contentServiceMock.Object; - var userServiceMock = new Mock(); - var permissions = new List(); - userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions); - var userService = userServiceMock.Object; - + //act - var result = ContentController.CheckPermissions(new Dictionary(), user, userService, contentService, 1234, 'F'); + var result = ContentController.CheckPermissions(new Dictionary(), user, null, null, -1); //assert Assert.IsTrue(result); } - } + [Test] + public void Access_To_Recycle_Bin_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, null, null, -20); - //we REALLY need a way to nicely mock the service context, etc... so we don't have to do integration tests... coming soon. + //assert + Assert.IsTrue(result); + } + + [Test] + public void No_Access_To_Recycle_Bin_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(1234); + var user = userMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, null, null, -20); + + //assert + Assert.IsFalse(result); + } + + [Test] + public void No_Access_To_Root_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(1234); + var user = userMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, null, null, -1); + + //assert + Assert.IsFalse(result); + } + + [Test] + public void Access_To_Root_By_Permission() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + + var userServiceMock = new Mock(); + var permissions = new List + { + new EntityPermission(9, 1234, new string[]{ "A" }) + }; + userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions); + var userService = userServiceMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, userService, null, -1, 'A'); + + //assert + Assert.IsTrue(result); + } + + [Test] + public void No_Access_To_Root_By_Permission() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + + var userServiceMock = new Mock(); + var permissions = new List + { + new EntityPermission(9, 1234, new string[]{ "A" }) + }; + userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions); + var userService = userServiceMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, userService, null, -1, 'B'); + + //assert + Assert.IsFalse(result); + } + + [Test] + public void Access_To_Recycle_Bin_By_Permission() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + + var userServiceMock = new Mock(); + var permissions = new List + { + new EntityPermission(9, 1234, new string[]{ "A" }) + }; + userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions); + var userService = userServiceMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, userService, null, -20, 'A'); + + //assert + Assert.IsTrue(result); + } + + [Test] + public void No_Access_To_Recycle_Bin_By_Permission() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + + var userServiceMock = new Mock(); + var permissions = new List + { + new EntityPermission(9, 1234, new string[]{ "A" }) + }; + userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions); + var userService = userServiceMock.Object; + + //act + var result = ContentController.CheckPermissions(new Dictionary(), user, userService, null, -20, 'B'); + + //assert + Assert.IsFalse(result); + } + + } //NOTE: The below self hosted stuff does work so need to get some tests written. Some are not possible atm because // of the legacy SQL calls like checking permissions. diff --git a/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs b/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs index 0a81bc1b4b..c24b5059a2 100644 --- a/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs +++ b/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs @@ -13,7 +13,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public class MediaControllerUnitTests { [Test] - public void Does_Not_Throw_Exception_When_Access_Allowed_By_Path() + public void Access_Allowed_By_Path() { //arrange var userMock = new Mock(); @@ -54,7 +54,7 @@ namespace Umbraco.Tests.Controllers.WebApiEditors } [Test] - public void Throws_Exception_When_No_Access_By_Path() + public void No_Access_By_Path() { //arrange var userMock = new Mock(); @@ -75,5 +75,68 @@ namespace Umbraco.Tests.Controllers.WebApiEditors Assert.IsFalse(result); } + [Test] + public void Access_To_Root_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartMediaId).Returns(-1); + var user = userMock.Object; + + //act + var result = MediaController.CheckPermissions(new Dictionary(), user, null, -1); + + //assert + Assert.IsTrue(result); + } + + [Test] + public void No_Access_To_Root_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartMediaId).Returns(1234); + var user = userMock.Object; + + //act + var result = MediaController.CheckPermissions(new Dictionary(), user, null, -1); + + //assert + Assert.IsFalse(result); + } + + [Test] + public void Access_To_Recycle_Bin_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartMediaId).Returns(-1); + var user = userMock.Object; + + //act + var result = MediaController.CheckPermissions(new Dictionary(), user, null, -21); + + //assert + Assert.IsTrue(result); + } + + [Test] + public void No_Access_To_Recycle_Bin_By_Path() + { + //arrange + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(0); + userMock.Setup(u => u.StartMediaId).Returns(1234); + var user = userMock.Object; + + //act + var result = MediaController.CheckPermissions(new Dictionary(), user, null, -21); + + //assert + Assert.IsFalse(result); + } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs index 154b4a5b5a..b51d5b84c9 100644 --- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs +++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs @@ -12,7 +12,7 @@ namespace Umbraco.Tests.Manifest [TestFixture] public class ManifestParserTests { - + [Test] public void Parse_Property_Editors_With_Pre_Vals() { @@ -82,16 +82,19 @@ namespace Umbraco.Tests.Manifest }, { alias: 'Test.Test2', - name: 'Test 2', + name: 'Test 2', defaultConfig: { key1: 'some default pre val' }, editor: { - view: '~/App_Plugins/MyPackage/PropertyEditors/CsvEditor.html' + view: '~/App_Plugins/MyPackage/PropertyEditors/CsvEditor.html', + hideLabel: true } } ]"); var parser = ManifestParser.GetPropertyEditors(a); Assert.AreEqual(2, parser.Count()); + + Assert.AreEqual(false, parser.ElementAt(0).ValueEditor.HideLabel); Assert.AreEqual("Test.Test1", parser.ElementAt(0).Alias); Assert.AreEqual("Test 1", parser.ElementAt(0).Name); Assert.AreEqual("/App_Plugins/MyPackage/PropertyEditors/MyEditor.html", parser.ElementAt(0).ValueEditor.View); @@ -104,6 +107,7 @@ namespace Umbraco.Tests.Manifest Assert.IsNotNull(manifestValidator2); Assert.AreEqual("regex", manifestValidator2.Type); + Assert.AreEqual(true, parser.ElementAt(1).ValueEditor.HideLabel); Assert.AreEqual("Test.Test2", parser.ElementAt(1).Alias); Assert.AreEqual("Test 2", parser.ElementAt(1).Name); Assert.IsTrue(parser.ElementAt(1).DefaultPreValues.ContainsKey("key1")); @@ -255,6 +259,46 @@ namespace Umbraco.Tests.Manifest //} + [Test] + public void Create_Manifest_With_Line_Comments() + { + var content4 = @"{ +//here's the property editors +propertyEditors: [], +//and here's the javascript +javascript: ['~/test.js', '~/test2.js']}"; + + var result = ManifestParser.CreateManifests(null, content4); + + Assert.AreEqual(1, result.Count()); + } + + [Test] + public void Create_Manifest_With_Surround_Comments() + { + var content4 = @"{ +propertyEditors: []/*we have empty property editors**/, +javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2.js']}"; + + var result = ManifestParser.CreateManifests(null, content4); + + Assert.AreEqual(1, result.Count()); + } + + [Test] + public void Create_Manifest_With_Error() + { + //NOTE: This is missing the final closing ] + var content4 = @"{ +propertyEditors: []/*we have empty property editors**/, +javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2.js' }"; + + var result = ManifestParser.CreateManifests(null, content4); + + //an error has occurred and been logged but processing continues + Assert.AreEqual(0, result.Count()); + } + [Test] public void Create_Manifest_From_File_Content() { @@ -282,9 +326,9 @@ namespace Umbraco.Tests.Manifest var result = ManifestParser.CreateManifests(null, content1, content2, content3, content4); Assert.AreEqual(4, result.Count()); - Assert.AreEqual(0, result.ElementAt(1).StyleSheetInitialize.Count); - Assert.AreEqual(2, result.ElementAt(2).StyleSheetInitialize.Count); - Assert.AreEqual(2, result.ElementAt(3).StyleSheetInitialize.Count); + Assert.AreEqual(0, result.ElementAt(1).StylesheetInitialize.Count); + Assert.AreEqual(2, result.ElementAt(2).StylesheetInitialize.Count); + Assert.AreEqual(2, result.ElementAt(3).StylesheetInitialize.Count); } diff --git a/src/Umbraco.Tests/MockTests.cs b/src/Umbraco.Tests/MockTests.cs new file mode 100644 index 0000000000..27c6a2d533 --- /dev/null +++ b/src/Umbraco.Tests/MockTests.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; +using NUnit.Framework; +using Umbraco.Core; +using Umbraco.Core.Persistence; +using Umbraco.Core.Persistence.UnitOfWork; +using Umbraco.Core.Services; +using Moq; +using Umbraco.Web; + +namespace Umbraco.Tests +{ + [TestFixture] + public class MockTests + { + + [Test] + public void Can_Create_Empty_App_Context() + { + var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); + Assert.Pass(); + } + + [Test] + public void Can_Create_Service_Context() + { + var svcCtx = new ServiceContext( + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new PackagingService( + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new RepositoryFactory(true), + new Mock().Object), + new Mock().Object, + new RelationService( + new Mock().Object, + new RepositoryFactory(true), + new Mock().Object), + new Mock().Object, + new Mock().Object); + Assert.Pass(); + } + + [Test] + public void Can_Create_Db_Context() + { + var dbCtx = new DatabaseContext(new Mock().Object); + Assert.Pass(); + } + + [Test] + public void Can_Create_App_Context_With_Services() + { + var appCtx = new ApplicationContext( + new DatabaseContext(new Mock().Object), + new ServiceContext( + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new PackagingService( + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new Mock().Object, + new RepositoryFactory(true), + new Mock().Object), + new Mock().Object, + new RelationService( + new Mock().Object, + new RepositoryFactory(true), + new Mock().Object), + new Mock().Object, + new Mock().Object), + CacheHelper.CreateDisabledCacheHelper()); + Assert.Pass(); + } + + [Test] + public void Can_Assign_App_Context_Singleton() + { + var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); + var result = ApplicationContext.EnsureContext(appCtx, true); + Assert.AreEqual(appCtx, result); + } + + [Test] + public void Does_Not_Overwrite_App_Context_Singleton() + { + ApplicationContext.EnsureContext(new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()), true); + var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); + var result = ApplicationContext.EnsureContext(appCtx, false); + Assert.AreNotEqual(appCtx, result); + } + + [NUnit.Framework.Ignore("Need to fix more stuff up, this is ignore because an exception occurs because it wants to ensure we have a resolver initialized - need to make that process better for testability")] + [Test] + public void Can_Get_Umbraco_Context() + { + var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); + ApplicationContext.EnsureContext(appCtx, true); + + var umbCtx = UmbracoContext.EnsureContext( + new Mock().Object, + appCtx, + true); + + Assert.AreEqual(umbCtx, UmbracoContext.Current); + } + + } +} diff --git a/src/Umbraco.Tests/Auditing/AuditTests.cs b/src/Umbraco.Tests/Persistence/Auditing/AuditTests.cs similarity index 92% rename from src/Umbraco.Tests/Auditing/AuditTests.cs rename to src/Umbraco.Tests/Persistence/Auditing/AuditTests.cs index ff5e6bb164..68e7bcb003 100644 --- a/src/Umbraco.Tests/Auditing/AuditTests.cs +++ b/src/Umbraco.Tests/Persistence/Auditing/AuditTests.cs @@ -1,35 +1,35 @@ -using System.Linq; -using NUnit.Framework; -using Umbraco.Core.Auditing; -using Umbraco.Core.Models.Rdbms; -using Umbraco.Tests.TestHelpers; - -namespace Umbraco.Tests.Auditing -{ - [TestFixture] - public class AuditTests : BaseDatabaseFactoryTest - { - [SetUp] - public override void Initialize() - { - base.Initialize(); - } - - [Test] - public void Can_Add_Audit_Entry() - { - Audit.Add(AuditTypes.System, "This is a System audit trail", 0, -1); - - var dtos = DatabaseContext.Database.Fetch("WHERE id > -1"); - - Assert.That(dtos.Any(), Is.True); - Assert.That(dtos.First().Comment, Is.EqualTo("This is a System audit trail")); - } - - [TearDown] - public override void TearDown() - { - base.TearDown(); - } - } +using System.Linq; +using NUnit.Framework; +using Umbraco.Core.Auditing; +using Umbraco.Core.Models.Rdbms; +using Umbraco.Tests.TestHelpers; + +namespace Umbraco.Tests.Persistence.Auditing +{ + [TestFixture] + public class AuditTests : BaseDatabaseFactoryTest + { + [SetUp] + public override void Initialize() + { + base.Initialize(); + } + + [Test] + public void Can_Add_Audit_Entry() + { + Audit.Add(AuditTypes.System, "This is a System audit trail", 0, -1); + + var dtos = DatabaseContext.Database.Fetch("WHERE id > -1"); + + Assert.That(dtos.Any(), Is.True); + Assert.That(dtos.First().Comment, Is.EqualTo("This is a System audit trail")); + } + + [TearDown] + public override void TearDown() + { + base.TearDown(); + } + } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index fa75070ad4..49a63a007e 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -189,6 +189,63 @@ namespace Umbraco.Tests.Persistence.Repositories } } + [Test] + public void MemberRepository_Does_Not_Replace_Password_When_Null() + { + IMember sut; + var provider = new PetaPocoUnitOfWorkProvider(); + var unitOfWork = provider.GetUnitOfWork(); + MemberTypeRepository memberTypeRepository; + using (var repository = CreateRepository(unitOfWork, out memberTypeRepository)) + { + var memberType = MockedContentTypes.CreateSimpleMemberType(); + memberTypeRepository.AddOrUpdate(memberType); + unitOfWork.Commit(); + + var member = MockedMember.CreateSimpleContent(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty", -1); + repository.AddOrUpdate(member); + unitOfWork.Commit(); + + sut = repository.Get(member.Id); + //when the password is null it will not overwrite what is already there. + sut.Password = null; + repository.AddOrUpdate(sut); + unitOfWork.Commit(); + sut = repository.Get(member.Id); + + Assert.That(sut.Password, Is.EqualTo("123")); + } + } + + [Test] + public void MemberRepository_Can_Update_Email_And_Login_When_Changed() + { + IMember sut; + var provider = new PetaPocoUnitOfWorkProvider(); + var unitOfWork = provider.GetUnitOfWork(); + MemberTypeRepository memberTypeRepository; + using (var repository = CreateRepository(unitOfWork, out memberTypeRepository)) + { + var memberType = MockedContentTypes.CreateSimpleMemberType(); + memberTypeRepository.AddOrUpdate(memberType); + unitOfWork.Commit(); + + var member = MockedMember.CreateSimpleContent(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty", -1); + repository.AddOrUpdate(member); + unitOfWork.Commit(); + + sut = repository.Get(member.Id); + sut.Username = "This is new"; + sut.Email = "thisisnew@hello.com"; + repository.AddOrUpdate(sut); + unitOfWork.Commit(); + sut = repository.Get(member.Id); + + Assert.That(sut.Email, Is.EqualTo("thisisnew@hello.com")); + Assert.That(sut.Username, Is.EqualTo("This is new")); + } + } + [Test] public void Can_Create_Correct_Subquery() { diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 2b00ea75cf..4b13acf7ee 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -3,8 +3,8 @@ using System.Web.Routing; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; -using Umbraco.Tests.Stubs; using Umbraco.Tests.TestHelpers; +using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; using Umbraco.Web.Models; using Umbraco.Web.Mvc; diff --git a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs index 0798da0770..375964c00d 100644 --- a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs +++ b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs @@ -1,7 +1,7 @@ using Moq; using NUnit.Framework; -using Umbraco.Tests.Stubs; using Umbraco.Tests.TestHelpers; +using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web.Routing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.template; diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index 54c6284748..5c300ab7a4 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -22,7 +22,6 @@ using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Publishing; using Umbraco.Core.Services; -using Umbraco.Tests.Stubs; using Umbraco.Web; using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.XmlPublishedCache; diff --git a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs index ab787bf105..d55a437976 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs @@ -4,7 +4,7 @@ using System.Web.Routing; using NUnit.Framework; using Umbraco.Core.Configuration; using Umbraco.Core.Models; -using Umbraco.Tests.Stubs; +using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index 064e48dd7f..36619e5f77 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -79,4 +79,4 @@ namespace Umbraco.Tests.TestHelpers } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Tests/Stubs/FakeLastChanceFinder.cs b/src/Umbraco.Tests/TestHelpers/Stubs/FakeLastChanceFinder.cs similarity index 81% rename from src/Umbraco.Tests/Stubs/FakeLastChanceFinder.cs rename to src/Umbraco.Tests/TestHelpers/Stubs/FakeLastChanceFinder.cs index 9090909baa..c9f5dbe024 100644 --- a/src/Umbraco.Tests/Stubs/FakeLastChanceFinder.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/FakeLastChanceFinder.cs @@ -1,12 +1,12 @@ -using Umbraco.Web.Routing; - -namespace Umbraco.Tests.Stubs -{ - internal class FakeLastChanceFinder : IContentFinder - { - public bool TryFindContent(PublishedContentRequest docRequest) - { - return false; - } - } +using Umbraco.Web.Routing; + +namespace Umbraco.Tests.TestHelpers.Stubs +{ + internal class FakeLastChanceFinder : IContentFinder + { + public bool TryFindContent(PublishedContentRequest docRequest) + { + return false; + } + } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs similarity index 94% rename from src/Umbraco.Tests/Stubs/TestControllerFactory.cs rename to src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs index 872093f896..5796ee5bc3 100644 --- a/src/Umbraco.Tests/Stubs/TestControllerFactory.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs @@ -1,40 +1,40 @@ -using System; -using System.Linq; -using System.Reflection; -using System.Web.Mvc; -using System.Web.Routing; -using System.Web.SessionState; -using Umbraco.Core; - -namespace Umbraco.Tests.Stubs -{ - /// - /// Used in place of the UmbracoControllerFactory which relies on BuildManager which throws exceptions in a unit test context - /// - internal class TestControllerFactory : IControllerFactory - { - - public IController CreateController(RequestContext requestContext, string controllerName) - { - var types = TypeFinder.FindClassesOfType(new[] { Assembly.GetExecutingAssembly() }); - - var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase)); - var t = controllerTypes.SingleOrDefault(); - - if (t == null) - return null; - - return Activator.CreateInstance(t) as IController; - } - - public System.Web.SessionState.SessionStateBehavior GetControllerSessionBehavior(RequestContext requestContext, string controllerName) - { - return SessionStateBehavior.Disabled; - } - - public void ReleaseController(IController controller) - { - controller.DisposeIfDisposable(); - } - } +using System; +using System.Linq; +using System.Reflection; +using System.Web.Mvc; +using System.Web.Routing; +using System.Web.SessionState; +using Umbraco.Core; + +namespace Umbraco.Tests.TestHelpers.Stubs +{ + /// + /// Used in place of the UmbracoControllerFactory which relies on BuildManager which throws exceptions in a unit test context + /// + internal class TestControllerFactory : IControllerFactory + { + + public IController CreateController(RequestContext requestContext, string controllerName) + { + var types = TypeFinder.FindClassesOfType(new[] { Assembly.GetExecutingAssembly() }); + + var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase)); + var t = controllerTypes.SingleOrDefault(); + + if (t == null) + return null; + + return Activator.CreateInstance(t) as IController; + } + + public System.Web.SessionState.SessionStateBehavior GetControllerSessionBehavior(RequestContext requestContext, string controllerName) + { + return SessionStateBehavior.Disabled; + } + + public void ReleaseController(IController controller) + { + controller.DisposeIfDisposable(); + } + } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index b5ad5b00e3..515cfd653c 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -164,7 +164,8 @@ - + + @@ -426,7 +427,7 @@ - + @@ -463,7 +464,7 @@ - + diff --git a/src/Umbraco.Web.UI.Client/docs/src/tutorials/Creating-Editors-Trees.ngdoc b/src/Umbraco.Web.UI.Client/docs/src/tutorials/Creating-Editors-Trees.ngdoc index 095719b05f..50596e4c7f 100644 --- a/src/Umbraco.Web.UI.Client/docs/src/tutorials/Creating-Editors-Trees.ngdoc +++ b/src/Umbraco.Web.UI.Client/docs/src/tutorials/Creating-Editors-Trees.ngdoc @@ -99,14 +99,14 @@ The main angular route to load in editors is */:section/:tree/:method/:id* Umbraco will load in views for this route based on these conventions: * If it is a core tree - views will be loaded from: */umbraco/views/{treetype}/{method}.html* - * If it is a custom (package) tree - views will be loaded from: */App_Plugins/{mypackage}/umbraco/{treetype}/{method}.html* + * If it is a custom (package) tree - views will be loaded from: */App_Plugins/{mypackage}/BackOffice/{treetype}/{method}.html* ###Editor locations By default each tree node's 'method' is assigned as 'edit' therefore these are the view paths for an editor when a tree node is clicked: * If it is a core tree - views will be loaded from: */umbraco/views/{treetype}/edit.html* - * If it is a custom (package) tree - views will be loaded from: */App_Plugins/{mypackage}/umbraco/{treetype}/edit.html* + * If it is a custom (package) tree - views will be loaded from: */App_Plugins/{mypackage}/BackOffice/{treetype}/edit.html* Developers can specify a custom `RoutePath` for any tree node which will cause umbraco to route to that specific location. @@ -115,7 +115,7 @@ Developers can specify a custom `RoutePath` for any tree node which will cause u Dialog view path locations are similar to editors: * If it is a core tree - views will be loaded from: umbraco/views/{treetype}/{action}.html - * If it is a custom (package) tree - views will be loaded from: /App_Plugins/{mypackage}/umbraco/{treetype}/{action}.html + * If it is a custom (package) tree - views will be loaded from: /App_Plugins/{mypackage}/BackOffice/{treetype}/{action}.html 'action' is the alias of your menu item, for example in the menu item in the example above this would be 'create'. @@ -127,7 +127,7 @@ An editor is simply an angular view (html file) so you can really do whatever yo First thing we'll do is create an angular controller for the editor, this controller will be contained in a file found beside the view - *the file naming conventions are based on the controller file naming conventions in the Umbraco core*. -/App_Plugins/MyPackage/Umbraco/MyTree/mypackage.mytree.edit.controller.js +/App_Plugins/MyPackage/BackOffice/MyTree/mypackage.mytree.edit.controller.js The controller is super simple, at it is going to do is assign a property to the $scope which shows the current item id being edited: @@ -146,7 +146,7 @@ The controller is super simple, at it is going to do is assign a property to the As per the conventions above our editor view will need to be located at: -/App_Plugins/MyPackage/Umbraco/MyTree/edit.html +/App_Plugins/MyPackage/BackOffice/MyTree/edit.html The view is simple, it is just going to show the current id being edited @@ -161,5 +161,5 @@ The view is simple, it is just going to show the current id being edited This is the same principle as an editor, you just need to follow conventions. Based on the above conventions the 'create' dialog view will be located here: -/App_Plugins/MyPackage/Umbraco/MyTree/create.html +/App_Plugins/MyPackage/BackOffice/MyTree/create.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbcontentname.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbcontentname.directive.js index 5ccfeb047b..1a8839171d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbcontentname.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbcontentname.directive.js @@ -19,9 +19,11 @@ angular.module("umbraco.directives") }, link: function(scope, element, attrs, ngModel) { + var inputElement = element.find("input"); + ngModel.$render = function(){ $timeout(function(){ - if(scope.model === ""){ + if(!scope.model){ scope.goEdit(); } }, 100); @@ -29,15 +31,21 @@ angular.module("umbraco.directives") scope.goEdit = function(){ scope.editMode = true; - $timeout(function(){ - element.find("input").focus(); + $timeout(function () { + inputElement.focus(); + if (inputElement.val() === "Empty...") { + inputElement.select(); + } }, 100); }; scope.exitEdit = function(){ scope.editMode = false; - if(scope.model === ""){ + if (!scope.model) { + //TODO: This will not solve the problem of showing validation! + // if this is a duplicate name the server will return a server side valiation + // message - and we still have no place for this to display. scope.model = "Empty..."; } }; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js index 89adf18abf..5432add07a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js @@ -4,10 +4,10 @@ * @restrict E **/ angular.module("umbraco.directives.html") - .directive('umbControlGroup', function () { + .directive('umbControlGroup', function (localizationService) { return { scope: { - label: "@", + label: "@label", description: "@", hideLabel: "@", alias: "@" @@ -15,6 +15,13 @@ angular.module("umbraco.directives.html") transclude: true, restrict: 'E', replace: true, - templateUrl: 'views/directives/html/umb-control-group.html' + templateUrl: 'views/directives/html/umb-control-group.html', + link: function (scope, element, attr){ + if(scope.label && scope.label[0] === "@"){ + scope.labelstring = localizationService.localize(scope.label.substring(1)); + }else{ + scope.labelstring = scope.label; + } + } }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/localize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/localize.directive.js index 70c412465b..578258a13b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/localize.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/localize.directive.js @@ -8,13 +8,37 @@ angular.module("umbraco.directives") replace: true, link: function (scope, element, attrs) { var key = scope.key; - if(key[0] === '#') - { - key = key.slice(1); - } - - var value = localizationService.getLocalizedString(key); + var value = localizationService.localize(key); element.html(value); } }; +}) +.directive('localize', function ($log, localizationService) { + return { + restrict: 'A', + link: function (scope, element, attrs) { + var keys = attrs.localize.split(','); + + for (var i = keys.length - 1; i >= 0; i--) { + var attr = element.attr(keys[i]); + + if(attr){ + var localizer = attr.split(':'); + var tokens; + var key = localizer[0]; + + if(localizer.length > 0){ + tokens = localizer[1].split(','); + for (var x = 0; x < tokens.length; x++) { + tokens[x] = scope.$eval(tokens[x]); + } + } + + if(key[0] === '@'){ + element.attr(keys[i], localizationService.localize(key.substring(1), tokens)); + } + } + } + } + }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js new file mode 100644 index 0000000000..f9c83d2d52 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js @@ -0,0 +1,71 @@ +/** +* @ngdoc directive +* @name umbraco.directives.directive:umbSections +* @restrict E +**/ +function sectionsDirective($timeout, $window, navigationService, sectionResource) { + return { + restrict: "E", // restrict to an element + replace: true, // replace the html element with the template + templateUrl: 'views/directives/umb-sections.html', + link: function (scope, element, attr, ctrl) { + + scope.maxSections = 7; + scope.overflowingSections = 0; + scope.sections = []; + + function loadSections(){ + sectionResource.getSections() + .then(function (result) { + scope.sections = result; + calculateHeight(); + }); + } + + function calculateHeight(){ + $timeout(function(){ + //total height minus room for avatar and help icon + var height = $(window).height()-200; + scope.totalSections = scope.sections.length; + scope.maxSections = Math.floor(height / 70); + scope.needTray = false; + + if(scope.totalSections > scope.maxSections){ + scope.needTray = true; + scope.overflowingSections = scope.maxSections - scope.totalSections; + } + }); + } + + //When the user logs in + scope.$on("authenticated", function (evt, data) { + //populate their sections if the user has changed + if (data.lastUserId !== data.user.id) { + loadSections(); + } + }); + + //on page resize + window.onresize = calculateHeight; + + scope.avatarClick = function(){ + navigationService.showUserDialog(); + }; + + scope.sectionClick = function(section){ + navigationService.showTree(section.alias); + }; + + scope.sectionDblClick = function(section){ + navigationService.changeSection(section.alias); + }; + + scope.trayClick = function(){ + navigationService.showTray(); + }; + + } + }; +} + +angular.module('umbraco.directives').directive("umbSections", sectionsDirective); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js index a95d12a315..f273f67556 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js @@ -13,12 +13,13 @@ angular.module("umbraco.directives") scope: { section: '@', + treealias: '@', + path: '@', activetree: '@', showoptions: '@', showheader: '@', cachekey: '@', - eventhandler: '=', - path: '@' + eventhandler: '=' }, compile: function (element, attrs) { @@ -31,12 +32,12 @@ angular.module("umbraco.directives") if(!hideheader){ template +='
' + - '
{{tree.name}}
' + + '
{{tree.name}}
' + '' + '
'; } template += '
    ' + - '' + + '' + '
' + '' + ''; @@ -65,24 +66,29 @@ angular.module("umbraco.directives") /** Method to load in the tree data */ function loadTree() { - if (scope.section) { + if (!scope.loading && scope.section) { + + scope.loading = true; //anytime we want to load the tree we need to disable the delete animations enableDeleteAnimations = false; //use $q.when because a promise OR raw data might be returned. - $q.when(treeService.getTree({ section: scope.section, cachekey: scope.cachekey })) + $q.when(treeService.getTree({ section: scope.section, tree: scope.treealias, cachekey: scope.cachekey })) .then(function (data) { //set the data once we have it scope.tree = data; //do timeout so that it re-enables them after this digest $timeout(function() { + //enable delete animations enableDeleteAnimations = true; }); + scope.loading = false; }, function (reason) { + scope.loading = false; notificationsService.error("Tree Error", reason); }); } @@ -123,21 +129,23 @@ angular.module("umbraco.directives") //watch for section changes scope.$watch("section", function (newVal, oldVal) { - if(!scope.tree){ - loadTree(); - } + + if(!scope.tree){ + loadTree(); + } - if (!newVal) { - //store the last section loaded - lastSection = oldVal; - }else if (newVal !== oldVal && newVal !== lastSection) { - //only reload the tree data and Dom if the newval is different from the old one - // and if the last section loaded is different from the requested one. - loadTree(); - - //store the new section to be loaded as the last section - lastSection = newVal; - } + if (!newVal) { + //store the last section loaded + lastSection = oldVal; + }else if (newVal !== oldVal && newVal !== lastSection) { + //only reload the tree data and Dom if the newval is different from the old one + // and if the last section loaded is different from the requested one. + loadTree(); + + //store the new section to be loaded as the last section + lastSection = newVal; + } + }); //watch for path changes diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js index 1fe91ae975..427399fbea 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js @@ -29,10 +29,11 @@ angular.module("umbraco.directives") eventhandler: '=', path: '@', node:'=', - activetree:'@' + activetree:'@', + tree:'=' }, - template: '
  • ' + + template: '
  • ' + '' + '' + '' + @@ -61,7 +62,7 @@ angular.module("umbraco.directives") about it. */ scope.options = function(e, n, ev){ - emitEvent("treeOptionsClick", {element: e, node: n, event: ev}); + emitEvent("treeOptionsClick", {element: e, tree: scope.tree, node: n, event: ev}); }; /** @@ -71,7 +72,7 @@ angular.module("umbraco.directives") defined on the tree */ scope.select = function(e,n,ev){ - emitEvent("treeNodeSelect", { element: e, node: n, event: ev }); + emitEvent("treeNodeSelect", { element: e, tree: scope.tree, node: n, event: ev }); }; /** method to set the current animation for the node. @@ -95,7 +96,7 @@ angular.module("umbraco.directives") scope.load = function(arrow, node) { if (node.expanded) { enableDeleteAnimations = false; - emitEvent("treeNodeCollapsing", { element: arrow, node: node }); + emitEvent("treeNodeCollapsing", { element: arrow, tree: scope.tree, node: node }); node.expanded = false; } else { @@ -106,19 +107,19 @@ angular.module("umbraco.directives") /* helper to force reloading children of a tree node */ scope.loadChildren = function(arrow, node, forceReload){ //emit treeNodeExpanding event, if a callback object is set on the tree - emitEvent("treeNodeExpanding", { element: arrow, node: node }); + emitEvent("treeNodeExpanding", { element: arrow, tree: scope.tree, node: node }); if (node.hasChildren && (forceReload || !node.children || (angular.isArray(node.children) && node.children.length === 0))) { //get the children from the tree service treeService.loadNodeChildren({ node: node, section: scope.section }) .then(function(data) { //emit expanded event - emitEvent("treeNodeExpanded", { element: arrow, node: node, children: data }); + emitEvent("treeNodeExpanded", { element: arrow, tree: scope.tree, node: node, children: data }); enableDeleteAnimations = true; }); } else { - emitEvent("treeNodeExpanded", { element: arrow, node: node, children: node.children }); + emitEvent("treeNodeExpanded", { element: arrow, tree: scope.tree, node: node, children: node.children }); node.expanded = true; enableDeleteAnimations = true; } @@ -139,6 +140,10 @@ angular.module("umbraco.directives") scope.loadChildren(null, scope.node, true); }else if( !node.metaData.treeAlias && activePath.indexOf(node.id) >= 0){ scope.loadChildren(null, scope.node, true); + + scope.path = activePath.filter( function(element) { + return listToDelete.indexOf(obj.id) === -1; + }); } } }; @@ -146,8 +151,9 @@ angular.module("umbraco.directives") //if the current path contains the node id, we will auto-expand the tree item children scope.expandActivePath(scope.node, scope.activetree, scope.path); + scope.node.stateCssClass = scope.node.cssClasses.join(" "); - var template = '
    '; + var template = '
    '; var newElement = angular.element(template); $compile(newElement)(scope); element.append(newElement); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js index 5e7f042825..1a36dcc24f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js @@ -1,8 +1,10 @@ angular.module('umbraco.directives.validation') .directive('valCompare',function () { return { - require: "ngModel", - link: function(scope, elem, attrs, ctrl) { + require: "ngModel", + link: function (scope, elem, attrs, ctrl) { + + //TODO: Pretty sure this should be done using a requires ^form in the directive declaration var otherInput = elem.inheritedData("$formController")[attrs.valCompare]; ctrl.$parsers.push(function(value) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js index 75ca905c4a..ad1b268618 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js @@ -5,8 +5,9 @@ * @element textarea * @requires formController * @description This directive is used to control the display of the property level validation message. -* We will listen for server side validation changes -* and when an error is detected for this property we'll show the error message +* We will listen for server side validation changes +* and when an error is detected for this property we'll show the error message. +* In order for this directive to work, the valStatusChanged directive must be placed on the containing form. **/ function valPropertyMsg(serverValidationManager) { return { @@ -32,17 +33,16 @@ function valPropertyMsg(serverValidationManager) { scope.errorMsg = ""; //listen for form error changes - scope.$watch(function() { - return formCtrl.$error; - }, function() { - if (formCtrl.$invalid) { + scope.$on("valStatusChanged", function(evt, args) { + if (args.form.$invalid) { //first we need to check if the valPropertyMsg validity is invalid if (formCtrl.$error.valPropertyMsg && formCtrl.$error.valPropertyMsg.length > 0) { //since we already have an error we'll just return since this means we've already set the // hasError and errorMsg properties which occurs below in the serverValidationManager.subscribe return; - } else if (element.closest(".umb-control-group").find(".ng-invalid").length > 0) { + } + else if (element.closest(".umb-control-group").find(".ng-invalid").length > 0) { //check if it's one of the properties that is invalid in the current content property hasError = true; //update the validation message if we don't already have one assigned. @@ -54,18 +54,20 @@ function valPropertyMsg(serverValidationManager) { } scope.errorMsg = err ? err.errorMsg : "Property has errors"; } - } else { + } + else { hasError = false; scope.errorMsg = ""; } - } else { + } + else { hasError = false; scope.errorMsg = ""; } }, true); //listen for the forms saving event - scope.$on("saving", function (ev, args) { + scope.$on("saving", function(ev, args) { showValidation = true; if (hasError && scope.errorMsg === "") { var err; @@ -73,7 +75,7 @@ function valPropertyMsg(serverValidationManager) { if (scope.property) { err = serverValidationManager.getPropertyError(scope.property.alias, ""); } - scope.errorMsg = err ? err.errorMsg : "Property has errors"; + scope.errorMsg = err ? err.errorMsg : "Property has errors"; } else if (!hasError) { scope.errorMsg = ""; @@ -93,14 +95,16 @@ function valPropertyMsg(serverValidationManager) { // So once a field is changed that has a server error assigned to it // we need to re-validate it for the server side validator so the user can resubmit // the form. Of course normal client-side validators will continue to execute. - scope.$watch("property.value", function (newValue) { + scope.$watch("property.value", function(newValue) { //we are explicitly checking for valServer errors here, since we shouldn't auto clear // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg // is the only one, then we'll clear. var errCount = 0; for (var e in formCtrl.$error) { - errCount++; + if (e) { + errCount++; + } } if ((errCount === 1 && formCtrl.$error.valPropertyMsg !== undefined) || diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js index bf37d73392..d1103cdbc3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js @@ -6,17 +6,36 @@ * NOTE: there's already an ng-pattern but this requires that a regex expression is set, not a regex string **/ function valRegex() { + return { require: 'ngModel', restrict: "A", link: function (scope, elm, attrs, ctrl) { + var flags = ""; + if (attrs.valRegexFlags) { + try { + flags = scope.$eval(attrs.valRegexFlags); + if (!flags) { + flags = attrs.valRegexFlags; + } + } + catch (e) { + flags = attrs.valRegexFlags; + } + } var regex; try { - regex = new RegExp(scope.$eval(attrs.valRegex)); + var resolved = scope.$eval(attrs.valRegex); + if (resolved) { + regex = new RegExp(resolved, flags); + } + else { + regex = new RegExp(attrs.valRegex, flags); + } } catch(e) { - regex = new RegExp(attrs.valRegex); + regex = new RegExp(attrs.valRegex, flags); } var patternValidator = function (viewValue) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valstatuschanged.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valstatuschanged.directive.js new file mode 100644 index 0000000000..aeb3b39ff7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valstatuschanged.directive.js @@ -0,0 +1,24 @@ +/** +* @ngdoc directive +* @name umbraco.directives.directive:valStatusChanged +* @restrict A +* @description Used to broadcast an event to all elements inside this one to notify that form validation has +* changed. If we don't use this that means you have to put a watch for each directive on a form's validation +* changing which would result in much higher processing. We need to actually watch the whole $error collection of a form +* because just watching $valid or $invalid doesn't acurrately trigger form validation changing. +**/ +function valStatusChanged() { + return { + require: "form", + restrict: "A", + link: function (scope, element, attr, formCtrl) { + + scope.$watch(function () { + return formCtrl.$error; + }, function () { + scope.$broadcast("valStatusChanged", { form: formCtrl }); + }, true); + } + }; +} +angular.module('umbraco.directives').directive("valStatusChanged", valStatusChanged); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js index 9740adfabc..c38466ac45 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js @@ -4,6 +4,7 @@ * @name umbraco.directives.directive:valTab * @restrict A * @description Used to show validation warnings for a tab to indicate that the tab content has validations errors in its data. +* In order for this directive to work, the valStatusChanged directive must be placed on the containing form. **/ function valTab() { return { @@ -15,23 +16,22 @@ function valTab() { scope.tabHasError = false; - //watch the current form's validation for the current field name - scope.$watch(function() { - return formCtrl.$valid; - }, function() { - var tabContent = element.closest(".umb-panel").find("#" + tabId); - - if (formCtrl.$invalid) { + //listen for form validation changes + scope.$on("valStatusChanged", function(evt, args) { + if (!args.form.$valid) { + var tabContent = element.closest(".umb-panel").find("#" + tabId); //check if the validation messages are contained inside of this tabs if (tabContent.find(".ng-invalid").length > 0) { scope.tabHasError = true; } else { scope.tabHasError = false; } - } else { + } + else { scope.tabHasError = false; } }); + } }; } diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 7cf9c61111..72cbfe9cd2 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -531,8 +531,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { */ publish: function (content, isNew, files) { return saveContentItem(content, "publish" + (isNew ? "New" : ""), files); + }, + + publishById: function(id){ + + if (!id) { + throw "id cannot be null"; + } + + return umbRequestHelper.resourcePromise( + $http.post( + umbRequestHelper.getApiUrl( + "contentApiBaseUrl", + "PostPublishById", + [{ id: id }])), + 'Failed to publish content with id ' + id); + } + }; } diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js index a23697344b..e008f3b69f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js @@ -95,7 +95,7 @@ function entityResource($q, $http, umbRequestHelper) { umbRequestHelper.getApiUrl( "entityApiBaseUrl", "GetById", - [{ id: id, type: type }])), + [{ id: id}, {type: type }])), 'Failed to retreive entity data for id ' + id); }, diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js index bf726be952..3f27e308a5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js @@ -30,7 +30,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) { * @methodOf umbraco.resources.memberResource * * @description - * Gets a member item with a given id + * Gets a member item with a given key * * ##usage * 
    @@ -41,7 +41,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *    });
          *
    * - * @param {Int} id id of member item to return + * @param {Guid} key key of member item to return * @returns {Promise} resourcePromise object containing the member item. * */ @@ -62,7 +62,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) { * @methodOf umbraco.resources.memberResource * * @description - * Deletes a member item with a given id + * Deletes a member item with a given key * * ##usage * 
    @@ -72,7 +72,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *    });
          *
    * - * @param {Int} id id of member item to delete + * @param {Guid} key id of member item to delete * @returns {Promise} resourcePromise object. * */ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js index 66391893ea..9938012cc3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js @@ -39,12 +39,19 @@ function treeResource($q, $http, umbRequestHelper) { throw "The object specified for does not contain a 'section' property"; } + if(!options.tree){ + options.tree = ""; + } + return umbRequestHelper.resourcePromise( $http.get( umbRequestHelper.getApiUrl( "treeApplicationApiBaseUrl", "GetApplicationTrees", - [{ application: options.section }])), + [ + {application: options.section}, + {tree: options.tree} + ])), 'Failed to retreive data for application tree ' + options.section); }, diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js index 03fd6b2946..25faf0b75c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js @@ -213,7 +213,7 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser } args.scope.$broadcast("saved", { scope: args.scope }); - if (!this.redirectToCreatedContent(args.newContent.id)) { + if (!this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.newContent.id)) { //we are not redirecting because this is not new content, it is existing content. In this case // we need to detect what properties have changed and re-bind them with the server data. diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js index 08f1690a1b..842f6ff7c3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js @@ -66,7 +66,7 @@ angular.module('umbraco.services') var scope = options.scope || $rootScope.$new(); //Modal dom obj and unique id - dialog.element = $('
    '); + dialog.element = $('
    '); var id = dialog.template.replace('.html', '').replace('.aspx', '').replace(/[\/|\.|:\&\?\=]/g, "-") + '-' + scope.$id; if (options.inline) { @@ -355,6 +355,25 @@ angular.module('umbraco.services') return openDialog(options); }, + /** + * @ngdoc method + * @name umbraco.services.dialogService#memberPicker + * @methodOf umbraco.services.dialogService + * + * @description + * Opens a member picker in a modal, the callback returns a object representing the selected member + * @param {Object} options member picker dialog options object + * @param {$scope} options.scope dialog scope + * @param {$scope} options.multiPicker should the tree pick one or multiple members before returning + * @param {Function} options.callback callback function + * @returns {Object} modal object + */ + memberPicker: function (options) { + options.template = 'views/common/dialogs/memberPicker.html'; + options.show = true; + return openDialog(options); + }, + /** * @ngdoc method * @name umbraco.services.dialogService#iconPicker @@ -383,6 +402,7 @@ angular.module('umbraco.services') * @param {Object} options iconpicker dialog options object * @param {$scope} options.scope dialog scope * @param {$scope} options.section tree section to display + * @param {$scope} options.treeAlias specific tree to display * @param {$scope} options.multiPicker should the tree pick one or multiple items before returning * @param {Function} options.callback callback function * @returns {Object} modal object diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js index b7b7b99b98..4f09611ef5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js @@ -1,8 +1,6 @@ angular.module('umbraco.services') .factory('localizationService', function ($http, $q, $rootScope, $window, $filter, userService) { - var localize = { - // use the $window service to get the language of the user's browser - language: userService.getCurrentUser().locale, + var service = { // array to hold the localized resource string entries dictionary:[], // location of the resource file @@ -13,61 +11,76 @@ angular.module('umbraco.services') // success handler for all server communication successCallback:function (data) { // store the returned array in the dictionary - localize.dictionary = data; + service.dictionary = data; // set the flag that the resource are loaded - localize.resourceFileLoaded = true; + service.resourceFileLoaded = true; // broadcast that the file has been loaded $rootScope.$broadcast('localizeResourcesUpdates'); }, // allows setting of language on the fly setLanguage: function(value) { - localize.language = value; - localize.initLocalizedResources(); + service.initLocalizedResources(); }, // allows setting of resource url on the fly setUrl: function(value) { - localize.url = value; - localize.initLocalizedResources(); - }, - - // builds the url for locating the resource file - buildUrl: function() { - return '/i18n/resources-locale_' + localize.language + '.js'; + service.url = value; + service.initLocalizedResources(); }, // loads the language resource file from the server initLocalizedResources:function () { var deferred = $q.defer(); // build the url to retrieve the localized resource file - $http({ method:"GET", url:localize.url, cache:false }) + $http({ method:"GET", url:service.url, cache:false }) .then(function(response){ - localize.resourceFileLoaded = true; - localize.dictionary = response.data; + service.resourceFileLoaded = true; + service.dictionary = response.data; $rootScope.$broadcast('localizeResourcesUpdates'); - return deferred.resolve(localize.dictionary); + return deferred.resolve(service.dictionary); }, function(err){ return deferred.reject("Something broke"); }); return deferred.promise; }, + //helper to tokenize and compile a localization string + tokenize: function(value,scope) { + if(value){ + var localizer = value.split(':'); + var retval = {tokens: undefined, key: localizer[0].substring(0)}; + if(localizer.length > 0){ + retval.tokens = localizer[1].split(','); + for (var x = 0; x < retval.tokens.length; x++) { + retval.tokens[x] = scope.$eval(retval.tokens[x]); + } + } + + return retval; + } + }, + // checks the dictionary for a localized resource string - getLocalizedString: function(value) { - if(localize.resourceFileLoaded){ - return _lookup(value); + localize: function(value,tokens) { + if(service.resourceFileLoaded){ + return service._lookup(value,tokens); }else{ - localize.initLocalizedResources().then(function(dic){ - return _lookup(value); + service.initLocalizedResources().then(function(dic){ + return service._lookup(value,tokens); }); } }, - _lookup: function(value){ - var entry = localize.dictionary[value]; + _lookup: function(value,tokens){ + var entry = service.dictionary[value]; if(entry){ + if(tokens){ + for (var i = 0; i < tokens.length; i++) { + entry = entry.replace("%"+i+"%", tokens[i]); + } + } return entry; } return "[" + value + "]"; @@ -77,8 +90,8 @@ angular.module('umbraco.services') }; // force the load of the resource file - localize.initLocalizedResources(); + service.initLocalizedResources(); // return the local instance when called - return localize; + return service; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index 2495bbf00c..326f4f51d6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -31,7 +31,7 @@ angular.module('umbraco.services') ui.showContextMenu = false; ui.showContextMenuDialog = false; ui.stickyNavigation = false; - + ui.showTray = false; service.hideUserDialog(); //$("#search-form input").focus(); break; @@ -53,6 +53,11 @@ angular.module('umbraco.services') ui.showContextMenu = false; ui.showSearchResults = true; ui.showContextMenuDialog = false; + + $timeout(function(){ + $("#search-field").focus(); + }); + break; default: ui.showNavigation = false; @@ -60,6 +65,7 @@ angular.module('umbraco.services') ui.showContextMenuDialog = false; ui.showSearchResults = false; ui.stickyNavigation = false; + ui.showTray = false; break; } } @@ -121,7 +127,14 @@ angular.module('umbraco.services') } setMode("tree"); }, - + + showTray: function () { + ui.showTray = true; + }, + + hideTray: function () { + ui.showTray = false; + }, /** * @ngdoc method * @name umbraco.services.navigationService#syncTree @@ -160,6 +173,10 @@ angular.module('umbraco.services') //TODO: investicate if we need to halt watch triggers //and instead pause them and then manually tell the tree to digest path changes //as this might be a bit heavy loading + if(!angular.isArray(path)){ + path = path.split(","); + } + this.ui.currentPath = path; }, @@ -192,7 +209,6 @@ angular.module('umbraco.services') return; } - service.active = false; $timeout(function(){ diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js index 39dda8f5d5..a5461a20cd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js @@ -1,56 +1,77 @@ angular.module('umbraco.services') -.factory('searchService', function ($q, $log, entityResource) { +.factory('searchService', function ($q, $log, entityResource, contentResource) { var m = {results: []}; - return { + var service = { results: m, - search: function(term){ - m.results.length = 0; - var deferred = $q.defer(); - var i = 0; - - entityResource.search(term, "Document").then(function(data){ + searchMembers: function(args){ + entityResource.search(args.term, "Member").then(function(data){ _.each(data, function(el){ - el.menuUrl = "UmbracoTrees/ContentTree/GetMenu?id=" + el.id + "&application=content"; + el.menuUrl = "UmbracoTrees/MemberTree/GetMenu?id=" + el.Id + "&application=member"; + el.metaData = {treeAlias: "member"}; + el.title = el.Fields.nodeName; + el.subTitle = el.Fields.email; + el.id = el.Id; }); - m.results.push({ + args.results.push({ + icon: "icon-user", + editor: "member/member/edit/", + matches: data + }); + }); + }, + searchContent: function(args){ + entityResource.search(args.term, "Document").then(function(data){ + + _.each(data, function(el){ + el.menuUrl = "UmbracoTrees/ContentTree/GetMenu?id=" + el.Id + "&application=content"; + el.metaData = {treeAlias: "content"}; + el.title = el.Fields.nodeName; + el.id = el.Id; + + contentResource.getNiceUrl(el.Id).then(function(url){ + el.subTitle = angular.fromJson(url); + }); + }); + + args.results.push({ icon: "icon-document", editor: "content/content/edit/", matches: data }); - i++; - - - if(i === 2){ - deferred.resolve(m); - } }); - - entityResource.search(term, "Media").then(function(data){ + }, + searchMedia: function(args){ + entityResource.search(args.term, "Media").then(function(data){ _.each(data, function(el){ - el.menuUrl = "UmbracoTrees/MediaTree/GetMenu?id=" + el.id + "&application=media"; + el.menuUrl = "UmbracoTrees/MediaTree/GetMenu?id=" + el.Id + "&application=media"; + el.metaData = {treeAlias: "media"}; + el.title = el.Fields.nodeName; + el.id = el.Id; }); - m.results.push({ + args.results.push({ icon: "icon-picture", editor: "media/media/edit/", matches: data }); - i++; - - if(i === 2){ - deferred.resolve(m); - } }); + }, + search: function(term){ + m.results.length = 0; - return deferred.promise; + service.searchMedia({term:term, results:m.results}); + service.searchContent({term:term, results:m.results}); + service.searchMembers({term:term, results:m.results}); }, setCurrent: function(sectionAlias){ currentSection = sectionAlias; } }; + + return service; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index cdeef6c823..038bf00113 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -27,6 +27,22 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro 'Failed to retreive entity data for id '); }, + /** + * @ngdoc method + * @name umbraco.services.tinyMceService#defaultPrevalues + * @methodOf umbraco.services.tinyMceService + * + * @description + * Returns a default configration to fallback on in case none is provided + * + */ + defaultPrevalues: function () { + var cfg = {}; + cfg.toolbar = ["code", "bold", "italic", "umbracocss","alignleft", "aligncenter", "alignright", "bullist","numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"]; + cfg.stylesheets = []; + cfg.dimensions = {height: 400, width: 600}; + return cfg; + }, /** * @ngdoc method diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js index b34cd72c79..ff079dde36 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js @@ -234,7 +234,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, $rootSc .then(function(data) { //this will be called once the tree app data has loaded var result = { - name: section, + name: data.name, alias: section, root: data }; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js index d44bb9ccb5..c39b56a5e9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js @@ -19,24 +19,31 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ */ dictionaryToQueryString: function (queryStrings) { - if (!angular.isArray(queryStrings)) { - throw "The queryString parameter is not an array of key value pairs"; + + if (angular.isArray(queryStrings)) { + return _.map(queryStrings, function (item) { + var key = null; + var val = null; + for (var k in item) { + key = k; + val = item[k]; + break; + } + if (key === null || val === null) { + throw "The object in the array was not formatted as a key/value pair"; + } + return key + "=" + val; + }).join("&"); } - return _.map(queryStrings, function (item) { - var key = null; - var val = null; - for (var k in item) { - key = k; - val = item[k]; - break; - } - if (key == null || val == null) { - throw "The object in the array was not formatted as a key/value pair"; - } - return key + "=" + val; - }).join("&"); + /* + //if we have a simple object, we can simply map with $.param + //but with the current structure we cant since an array is an object and an object is an array + if(angular.isObject(queryStrings)){ + return decodeURIComponent($.param(queryStrings)); + }*/ + throw "The queryString parameter is not an array of key value pairs"; }, /** diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 1deb464037..1fc040527a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -203,7 +203,7 @@ function umbDataFormatter() { /** formats the display model used to display the member to the model used to save the member */ formatMemberPostData: function(displayModel, action) { - //this is basically the same as for media but we need to explicitly add the username,email to the save model + //this is basically the same as for media but we need to explicitly add the username,email, password to the save model var saveModel = this.formatMediaPostData(displayModel, action); var genericTab = _.find(displayModel.tabs, function (item) { @@ -216,8 +216,12 @@ function umbDataFormatter() { var propEmail = _.find(genericTab.properties, function (item) { return item.alias === "_umb_email"; }); + var propPass = _.find(genericTab.properties, function (item) { + return item.alias === "_umb_password"; + }); saveModel.email = propEmail.value; saveModel.username = propLogin.value; + saveModel.password = propPass.value; return saveModel; }, diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html index 7b1800850e..34656d0759 100644 --- a/src/Umbraco.Web.UI.Client/src/index.html +++ b/src/Umbraco.Web.UI.Client/src/index.html @@ -10,7 +10,7 @@ -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 79aeca4333..3a35c06ad5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -4,12 +4,8 @@ // UMBRACO STYLES // -------------- -.hideLabel label { - display: none; -} -.hideLabel .controls-row { - margin-left: 0px !Important; -} + + small.umb-detail, label small, .guiDialogTiny { diff --git a/src/Umbraco.Web.UI.Client/src/less/grid.less b/src/Umbraco.Web.UI.Client/src/less/grid.less index dc2c1b5345..1734cba772 100644 --- a/src/Umbraco.Web.UI.Client/src/less/grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/grid.less @@ -66,14 +66,26 @@ body { position: absolute; } -/* refactor colors into a seperate class */ #applications { z-index: 1000; height: 100%; - position: relative; + left: 0px; + top: 0; + bottom: 0; + position: absolute; text-align: center } +#applications-tray { + z-index: 900; + left: 80px; + top: 0; + bottom: 0; + position: absolute; + height: 100%; + text-align: center; +} + #search-form { display: block; margin: 0px; @@ -105,7 +117,6 @@ body { padding-top: 100px; } - #dialog { min-width: 500px; left: 100%; diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index fc932805ce..a82d72b1b0 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -86,6 +86,10 @@ color: @grayLight } +.umb-listview .selected i.icon, .umb-listview tr:hover i.icon{display: none} +.umb-listview .selected input[type="checkbox"], .umb-listview tr:hover input[type="checkbox"]{display: inline-block;} +.umb-listview .inactive{color: @grayLight;} + .umb-listview table thead { font-size: 11px; font-weight: 600; diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index dc67ac1d3a..fe8c76bd19 100644 --- a/src/Umbraco.Web.UI.Client/src/less/main.less +++ b/src/Umbraco.Web.UI.Client/src/less/main.less @@ -113,7 +113,6 @@ h5{ padding-bottom: 15px; margin-bottom: 10px !important; } - .umb-pane > .umb-control-group:last-child { border: none; padding-bottom: 0 !important; @@ -146,7 +145,7 @@ h5{ display: inline-block } -.hidelabel .controls-row { +.hidelabel > div > .controls-row, .hidelabel > .controls-row { padding: 0px; border: none; margin: 0px !important; diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index ae854db66a..dba73d1c07 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -58,7 +58,7 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} position: absolute; padding: 0px 0px 0px 20px; } -.umb-panel-header h1, { +.umb-panel-header h1 { margin: 0; font-size: @fontSizeMedium; font-weight: 400; @@ -71,7 +71,6 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} .umb-headline-editor-wrapper input { background: none; border: none; - width: auto; margin: -9px 0 0 0; padding: 0 0 2px 0; border-radius: 0; diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index dcb134bd85..b0472e8e76 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -17,6 +17,13 @@ width: 95%; } +.umb-dialog .umb-editor { + width: 95%; +} +.umb-dialog .umb-control-group .help-block { + width: 95%; +} + .umb-codeeditor{ width: 99%; } diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index 19ce8cb0c3..3f6f10ae74 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -6,6 +6,7 @@ ul.sections { display: block; background: @blackLight; height: 100%; + width: 80px; } ul.sections li { @@ -97,8 +98,7 @@ ul.sections li.current a{ padding-left: 0px; } -ul.sections li.help { - +ul.sections li.help { margin: 0; position: absolute; bottom: 0; @@ -110,3 +110,12 @@ ul.sections li.help { ul.sections li.help a { border-bottom: none; } + +// Section slide-out tray for additional apps +// ------------------------- +li.expand a, li.expand{border: none !Important;} + +ul.sections-tray { + padding-top: 100px; + width: 80px; +} diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index 78aca06998..2aa2256860 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -138,6 +138,12 @@ background: @grayLighter } +.umb-tree small.search-subtitle{ + color: @grayLight; + display: block; + padding-left: 35px; +} + a.umb-options { visibility: hidden; cursor: pointer; @@ -208,6 +214,32 @@ li.root > div > a.umb-options { float: left } + +// Tree item states +// ------------------------- +div.not-published > i.icon,div.not-published > a{ + color: @grayLight; +} +div.protected:before{ + content:"\e256"; + font-family: 'icomoon'; + color: @red; + position: absolute; + font-size: 20px; + padding-left: 7px; + padding-top: 7px; +} + +div.has-unpublished-version:before{ + content:"\e25a"; + font-family: 'icomoon'; + color: @green; + position: absolute; + font-size: 20px; + padding-left: 7px; + padding-top: 7px; +} + // Tree context menu // ------------------------- .umb-actions { diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js index 9ef8f48768..3d4b1dbd8a 100644 --- a/src/Umbraco.Web.UI.Client/src/routes.js +++ b/src/Umbraco.Web.UI.Client/src/routes.js @@ -95,7 +95,7 @@ app.config(function ($routeProvider) { // Here we need to figure out if this route is for a package tree and if so then we need // to change it's convention view path to: - // /App_Plugins/{mypackage}/umbraco/{treetype}/{method}.html + // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html // otherwise if it is a core tree we use the core paths: // views/{treetype}/{method}.html @@ -105,7 +105,7 @@ app.config(function ($routeProvider) { if (packageTreeFolder) { $scope.templateUrl = Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath + "/" + packageTreeFolder + - "/umbraco/" + $routeParams.tree + "/" + $routeParams.method + ".html"; + "/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html"; } else { $scope.templateUrl = 'views/' + $routeParams.tree + '/' + $routeParams.method + '.html'; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js index 4861499cf6..a172a482fb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js @@ -1,8 +1,41 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController", - function ($scope, eventsService, $log) { + function ($scope, eventsService, entityResource, searchService, $log) { var dialogOptions = $scope.$parent.dialogOptions; $scope.dialogTreeEventHandler = $({}); + $scope.results = []; + + $scope.select = function(result){ + entityResource.getById(result.id, "Document").then(function(ent){ + if(dialogOptions && dialogOptions.multipicker){ + + $scope.showSearch = false; + $scope.results = []; + $scope.term = ""; + $scope.oldTerm = undefined; + + $scope.select(ent); + }else{ + $scope.submit(ent); + } + }); + }; + + $scope.performSearch = function(){ + if($scope.term){ + if($scope.oldTerm !== $scope.term){ + $scope.results = []; + searchService.searchContent({term: $scope.term, results: $scope.results}); + $scope.showSearch = true; + $scope.oldTerm = $scope.term; + } + }else{ + $scope.oldTerm = ""; + $scope.showSearch = false; + $scope.results = []; + } + }; + $scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){ args.event.preventDefault(); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html index 57549f01da..32109e5fcd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html @@ -1,19 +1,54 @@
    -
    - - - - +
    +
    +
    + + +
    +
    +
    +
    + + + +
    + + +
    -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html index 8315d7a1e2..5677b5feb0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html @@ -1,7 +1,7 @@
    - + - - + + + path="target.path">
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js new file mode 100644 index 0000000000..0a00e199f4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js @@ -0,0 +1,54 @@ +//used for the member picker dialog +angular.module("umbraco").controller("Umbraco.Dialogs.MemberPickerController", + function ($scope, eventsService, searchService, $log) { + var dialogOptions = $scope.$parent.dialogOptions; + $scope.dialogTreeEventHandler = $({}); + $scope.results = []; + + $scope.performSearch = function(){ + if($scope.term){ + if($scope.oldTerm !== $scope.term){ + $scope.results = []; + searchService.searchMembers({term: $scope.term, results: $scope.results}); + $scope.showSearch = true; + $scope.oldTerm = $scope.term; + } + }else{ + $scope.oldTerm = ""; + $scope.showSearch = false; + $scope.results = []; + } + }; + + + $scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){ + args.event.preventDefault(); + args.event.stopPropagation(); + + if(args.node.nodetype === "member-folder"){ + return; + } + + eventsService.publish("Umbraco.Dialogs.MemberPickerController.Select", args).then(function(args){ + if(dialogOptions && dialogOptions.multipicker){ + + var c = $(args.event.target.parentElement); + if(!args.node.selected){ + args.node.selected = true; + c.find("i.umb-tree-icon").hide() + .after(""); + }else{ + args.node.selected = false; + c.find(".temporary").remove(); + c.find("i.umb-tree-icon").show(); + } + $scope.select(args.node); + + }else{ + $scope.submit(args.node); + } + + }); + + }); +}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html new file mode 100644 index 0000000000..5ba68a053a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html @@ -0,0 +1,57 @@ +
    +
    +
    +
    + + +
    +
    +
    +
    + + + +
    + + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js index 8a0c48a13e..5005d329b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js @@ -4,6 +4,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", var dialogOptions = $scope.$parent.dialogOptions; $scope.dialogTreeEventHandler = $({}); $scope.section = dialogOptions.section; + $scope.treeAlias = dialogOptions.treeAlias; $scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){ diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html index 77fe01587a..205d8548cc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html @@ -3,7 +3,8 @@
    + ng-submit="save()" + val-status-changed> @@ -19,13 +20,17 @@
    - Preview page + + Preview page +
    Publish + prevent-default data-hotkey="ctrl+p"> + Publish + @@ -33,9 +38,11 @@
    @@ -54,8 +61,5 @@
    - - - {{content | json}} diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html index db41e8666a..25422d0a43 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html @@ -1,4 +1,4 @@ -
    +

    Change password

    Enter your current password, then repeat your new password to change it

    @@ -42,8 +42,7 @@ - +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 3983777263..387fc8ef0b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -84,7 +84,15 @@ function ChangePasswordDashboardController($scope, xmlhelper, $log, userResource //this is the model we will pass to the service $scope.profile = {}; - $scope.changePassword = function (p) { + $scope.changePassword = function (p) { + + //ensure form is dirty so the styles validate + $scope.passwordForm.$setDirty(true); + + if ($scope.passwordForm.$invalid) { + return; + } + userResource.changePassword(p.oldPassword, p.newPassword).then(function () { $scope.passwordForm.$setValidity(true); }, function () { diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html index 4a10a5efe1..45a86c7a76 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html @@ -1,7 +1,8 @@
    + ng-submit="save()" + val-status-changed> diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html index 35c24d45c2..75734da2dd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html @@ -1,8 +1,8 @@
    -
    +
    -
    • + + + - -
    - +
    +
    + diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html index 221886e162..5501ccb381 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html @@ -1,12 +1,15 @@  + ng-submit="save()" + val-status-changed>
    - +
    @@ -24,7 +27,6 @@ -
    -     +     \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 493739842b..adc1a85796 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -6,14 +6,14 @@ * @description * The controller for the member editor */ -function MemberEditController($scope, $routeParams, $q, $timeout, $window, memberResource, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, editorContextService) { +function MemberEditController($scope, $routeParams, $location, $q, $timeout, $window, memberResource, entityResource, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, editorContextService) { //initialize the file manager fileManager.clearFiles(); if ($routeParams.create) { //we are creating so get an empty member item - memberResource.getScaffold($routeParams.id, $routeParams.doctype) + memberResource.getScaffold($routeParams.doctype) .then(function(data) { $scope.loaded = true; $scope.content = data; @@ -21,19 +21,29 @@ function MemberEditController($scope, $routeParams, $q, $timeout, $window, membe }); } else { - //we are editing so get the content item from the server - memberResource.getByKey($routeParams.id) - .then(function(data) { - $scope.loaded = true; - $scope.content = data; - editorContextService.setContext($scope.content); - - //in one particular special case, after we've created a new item we redirect back to the edit - // route but there might be server validation errors in the collection which we need to display - // after the redirect, so we will bind all subscriptions which will show the server validation errors - // if there are any and then clear them so the collection no longer persists them. - serverValidationManager.executeAndClearAllSubscriptions(); + //so, we usually refernce all editors with the Int ID, but with members we have + //a different pattern, adding a route-redirect here to handle this: + //isNumber doesnt work here since its seen as a string + if($routeParams.id && $routeParams.id.length < 9){ + entityResource.getById($routeParams.id, "Member").then(function(entity){ + $location.path("member/member/edit/" + entity.key); }); + }else{ + //we are editing so get the content item from the server + memberResource.getByKey($routeParams.id) + .then(function(data) { + $scope.loaded = true; + $scope.content = data; + editorContextService.setContext($scope.content); + + //in one particular special case, after we've created a new item we redirect back to the edit + // route but there might be server validation errors in the collection which we need to display + // after the redirect, so we will bind all subscriptions which will show the server validation errors + // if there are any and then clear them so the collection no longer persists them. + serverValidationManager.executeAndClearAllSubscriptions(); + }); + } + } //TODO: Need to figure out a way to share the saving and event broadcasting with all editors! @@ -65,6 +75,8 @@ function MemberEditController($scope, $routeParams, $q, $timeout, $window, membe contentEditingHelper.handleSuccessfulSave({ scope: $scope, newContent: data, + //specify a custom id to redirect to since we want to use the GUID + redirectId: data.key, rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data) }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js index bafd28e90b..1891e628c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js @@ -23,4 +23,4 @@ function booleanEditorController($scope, $rootScope, assetsService) { }; } -angular.module("umbraco").controller("Umbraco.Editors.BooleanController", booleanEditorController); \ No newline at end of file +angular.module("umbraco").controller("Umbraco.PropertyEditors.BooleanController", booleanEditorController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html index 37e1030614..afdeca161f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html @@ -1,3 +1,3 @@ -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js new file mode 100644 index 0000000000..e5d8739d51 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js @@ -0,0 +1,55 @@ +angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordController", + function($scope) { + + //the model config will contain an object, if it does not we'll create defaults + //NOTE: We will not support doing the password regex on the client side because the regex on the server side + //based on the membership provider cannot always be ported to js from .net directly. + /* + { + hasPassword: true/false, + requiresQuestionAnswer: true/false, + enableReset: true/false, + enablePasswordRetrieval: true/false, + minPasswordLength: 10 + } + */ + + //set defaults if they are not available + if (!$scope.model.config || $scope.model.config.hasPassword === undefined) { + $scope.model.config.hasPassword = false; + } + if (!$scope.model.config || $scope.model.config.enablePasswordRetrieval === undefined) { + $scope.model.config.enablePasswordRetrieval = true; + } + if (!$scope.model.config || $scope.model.config.requiresQuestionAnswer === undefined) { + $scope.model.config.requiresQuestionAnswer = false; + } + if (!$scope.model.config || $scope.model.config.enableReset === undefined) { + $scope.model.config.enableReset = true; + } + if (!$scope.model.config || $scope.model.config.minPasswordLength === undefined) { + $scope.model.config.minPasswordLength = 0; + } + + //set the model defaults - we never get supplied a password from the server so this is ok to overwrite. + $scope.model.value = { + newPassword: "", + oldPassword: null, + reset: null, + answer: null + }; + //the value to compare to match passwords + $scope.confirm = ""; + + //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there + //with validators turned on. + $scope.changing = !$scope.model.config.hasPassword; + + $scope.doChange = function() { + $scope.changing = true; + }; + + $scope.cancelChange = function() { + $scope.changing = false; + }; + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html new file mode 100644 index 0000000000..fa67b50b53 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html @@ -0,0 +1,58 @@ +
    + +
    + +
    + +
    + + +
    +
    + + +
    + +
    + + Required + +
    +
    + +
    + +
    + + Required + Minimum {{model.config.minPasswordLength}} characters + +
    +
    + +
    + +
    + + + Passwords must match +
    +
    + + Cancel +
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js index d343fe903e..fe31c6ad78 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.CheckboxListController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController", function($scope) { if (!angular.isObject($scope.model.config.items)) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html index cfed867ae2..ae691215e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html @@ -1,4 +1,4 @@ -
    +
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js index b5876a1c2b..3a5bae3e4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.CodeMirrorController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.CodeMirrorController", function ($scope, $rootScope, assetsService) { /* diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html index 2e42f2c702..39a9b4a6f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html @@ -1,4 +1,4 @@ -
      +
      {{model.value}}
      \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js index ff649c1e72..47aa5ee4b9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js @@ -4,4 +4,4 @@ function ColorPickerController($scope) { }; } -angular.module("umbraco").controller("Umbraco.Editors.ColorPickerController", ColorPickerController); +angular.module("umbraco").controller("Umbraco.PropertyEditors.ColorPickerController", ColorPickerController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html index bf44552a3e..d18548105e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html @@ -1,4 +1,4 @@ -
      +
      • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index c623865994..4870733f51 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -1,7 +1,7 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it angular.module('umbraco') -.controller("Umbraco.Editors.ContentPickerController", +.controller("Umbraco.PropertyEditors.ContentPickerController", function($scope, dialogService, entityResource, $log, iconHelper){ $scope.ids = $scope.model.value.split(','); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 257b906e0e..6bf89d233f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -1,4 +1,4 @@ -
        +
        • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 36d9e07348..2ee3c3bcf7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.DatepickerController", function ($scope, notificationsService, assetsService) { //setup the default config diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html index bbaa8b3c23..64ef2d271a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html @@ -1,4 +1,4 @@ -
          +
          +
          + + Required + Invalid email + +
          diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js index f8e8981d3b..95ed124517 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js @@ -120,5 +120,5 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag }); }; -angular.module("umbraco").controller('Umbraco.Editors.FileUploadController', fileUploadController); +angular.module("umbraco").controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html index 471a06f7f7..cc53f7b6ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html @@ -1,4 +1,4 @@ -
          +
          diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js index 798b37ec2e..9de6782e20 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js @@ -10,7 +10,7 @@ angular.module("umbraco") } }; }) -.controller("Umbraco.Editors.FolderBrowserController", +.controller("Umbraco.PropertyEditors.FolderBrowserController", function ($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, umbRequestHelper, mediaResource, imageHelper) { var dialogOptions = $scope.$parent.dialogOptions; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html index 9dd55d348e..1ab36a1953 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html @@ -1,4 +1,4 @@ -
          +
          \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index c0c86af346..8fb26e43c2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -1,7 +1,7 @@ 'use strict'; //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it -angular.module("umbraco").controller("Umbraco.Editors.GridController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.GridController", function($rootScope, $scope, dialogService, $log){ //we most likely will need some iframe-motherpage interop here diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 29fd896c75..afb8d27e6a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -1,3 +1,3 @@ -
          +
          \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index f4e0e1b986..3c4ff59e39 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -1,6 +1,6 @@ angular.module("umbraco") - .controller("Umbraco.Editors.ListViewController", - function ($rootScope, $scope, $routeParams, contentResource, contentTypeResource, editorContextService, notificationsService) { + .controller("Umbraco.PropertyEditors.ListViewController", + function ($rootScope, $scope, $routeParams, contentResource, contentTypeResource, editorContextService, notificationsService, iconHelper) { $scope.selected = []; $scope.actionInProgress = false; @@ -78,17 +78,26 @@ angular.module("umbraco") } }; - $scope.updateSelection = function ($event, id) { - var checkbox = $event.target; - var action = (checkbox.checked ? 'add' : 'remove'); - updateSelected(action, id); + $scope.updateSelection = function ($event, item) { + if(item.selected){ + item.selected = false; + var index = $scope.selected.indexOf(item.id); + if(index){ + $scope.selected.splice(index, 1); + } + }else{ + item.selected = true; + $scope.selected.push(item.id); + } }; $scope.selectAll = function ($event) { var checkbox = $event.target; var action = (checkbox.checked ? 'add' : 'remove'); + for (var i = 0; i < $scope.listViewResultSet.items.length; i++) { var entity = $scope.listViewResultSet.items[i]; + entity.selected = checkbox.checked; updateSelected(action, entity.id); } }; @@ -112,6 +121,10 @@ angular.module("umbraco") return $scope.selected.length > 0; }; + $scope.getIcon = function(entry){ + return iconHelper.convertFromLegacyIcon(entry.icon); + }; + $scope.delete = function () { if (confirm("Sure you want to delete?") == true) { @@ -142,25 +155,43 @@ angular.module("umbraco") var current = 1; var total = $scope.selected.length; for (var i = 0; i < $scope.selected.length; i++) { - $scope.bulkStatus = "Publishing doc " + current + " out of " + total + " documents"; + $scope.bulkStatus = "Publishing " + current + " out of " + total + " documents"; - contentResource.getById($scope.selected[i]).then(function(content) { - contentResource.publish(content, false) - .then(function(content){ - if (current == total) { - notificationsService.success("Bulk action", "Published " + total + "documents"); - $scope.bulkStatus = ""; - $scope.reloadView($scope.content.id); - $scope.actionInProgress = false; - } - current++; - }); - }); + contentResource.publishById($scope.selected[i]) + .then(function(content){ + if (current == total) { + notificationsService.success("Bulk action", "Published " + total + "documents"); + $scope.bulkStatus = ""; + $scope.reloadView($scope.content.id); + $scope.actionInProgress = false; + } + current++; + }); + } }; $scope.unpublish = function () { + $scope.actionInProgress = true; + $scope.bulkStatus = "Starting with publish"; + var current = 1; + var total = $scope.selected.length; + for (var i = 0; i < $scope.selected.length; i++) { + $scope.bulkStatus = "Unpublishing " + current + " out of " + total + " documents"; + + contentResource.unPublish($scope.selected[i]) + .then(function(content){ + + if (current == total) { + notificationsService.success("Bulk action", "Published " + total + "documents"); + $scope.bulkStatus = ""; + $scope.reloadView($scope.content.id); + $scope.actionInProgress = false; + } + current++; + }); + } }; if($routeParams.id){ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index f189921ffd..3fe0fae2dc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -1,5 +1,5 @@ -
          +
          @@ -47,9 +47,16 @@ - - - {{result.name}} + + + + + + + + {{result.name}} {{result.updateDate|date:'medium'}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index 59a8193866..b9a9cc5715 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -1,6 +1,6 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it -angular.module('umbraco').controller("Umbraco.Editors.MediaPickerController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController", function($rootScope, $scope, dialogService, mediaResource, imageHelper, $log) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html index e9c62d88f4..50aa307586 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html @@ -1,4 +1,4 @@ -
          +
          • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js new file mode 100644 index 0000000000..0714ef25d4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js @@ -0,0 +1,58 @@ +//this controller simply tells the dialogs service to open a memberPicker window +//with a specified callback, this callback will receive an object with a selection on it +angular.module('umbraco') +.controller("Umbraco.PropertyEditors.MemberPickerController", + + function($scope, dialogService, entityResource, $log, iconHelper){ + $scope.ids = $scope.model.value.split(','); + $scope.renderModel = []; + $scope.multipicker = true; + + entityResource.getByIds($scope.ids, "Member").then(function(data){ + $(data).each(function(i, item){ + item.icon = iconHelper.convertFromLegacyIcon(item.icon); + $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon}); + }); + }); + + $scope.openMemberPicker =function(){ + var d = dialogService.memberPicker({scope: $scope, multipicker: $scope.multipicker, callback: populate}); + }; + + $scope.remove =function(index){ + $scope.renderModel.splice(index, 1); + $scope.ids.splice(index, 1); + $scope.model.value = trim($scope.ids.join(), ","); + }; + + $scope.add =function(item){ + if($scope.ids.indexOf(item.id) < 0){ + item.icon = iconHelper.convertFromLegacyIcon(item.icon); + $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon}); + $scope.ids.push(item.id); + $scope.model.value = trim($scope.ids.join(), ","); + } + }; + + $scope.clear = function() { + $scope.ids = []; + $scope.model.value = ""; + $scope.renderModel = []; + }; + + function trim(str, chr) { + var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^'+chr+'+|'+chr+'+$', 'g'); + return str.replace(rgxtrim, ''); + } + + function populate(data){ + if(data.selection && angular.isArray(data.selection)){ + $(data.selection).each(function(i, item){ + $scope.add(item); + }); + }else{ + $scope.clear(); + $scope.add(data); + } + } +}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html new file mode 100644 index 0000000000..8cc1f82e4a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html @@ -0,0 +1,21 @@ +
            + + + + + +
            \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js index 09f555498a..1b0e863097 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js @@ -31,4 +31,4 @@ } -angular.module("umbraco").controller("Umbraco.Editors.MultipleTextBoxController", MultipleTextBoxController); +angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html index 3492ac76d7..0aa0a86ed4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html @@ -1,4 +1,4 @@ -
            +
            diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js index f226a4ddfc..e1764e1750 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js @@ -45,4 +45,4 @@ function ReadOnlyValueController($rootScope, $scope, $filter) { }); } -angular.module('umbraco').controller("Umbraco.Editors.ReadOnlyValueController", ReadOnlyValueController); \ No newline at end of file +angular.module('umbraco').controller("Umbraco.PropertyEditors.ReadOnlyValueController", ReadOnlyValueController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html index df58ca6acc..84483c56a7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html @@ -1,3 +1,3 @@ -
            +
            {{displayvalue}}
            \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js index 7a56fe947e..82912a3ae2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") - .controller("Umbraco.Editors.RelatedLinksController", + .controller("Umbraco.PropertyEditors.RelatedLinksController", function ($rootScope, $scope, dialogService, $routeParams, contentResource, contentTypeResource, editorContextService, notificationsService) { $scope.newCaption = ''; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html index cc05a78cf5..0be042777a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html @@ -1,4 +1,4 @@ -
            +
            diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 3c1015109c..4c6658f280 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") - .controller("Umbraco.Editors.RTEController", + .controller("Umbraco.PropertyEditors.RTEController", function ($rootScope, $element, $scope, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper) { tinyMceService.configuration().then(function(tinyMceConfig){ @@ -13,13 +13,14 @@ angular.module("umbraco") } }).join(" "); - //serialize the property editor config (most likely not needed due to shannons fixes) - var editorConfig = angular.fromJson($scope.model.config.editor); + var editorConfig = $scope.model.config.editor; + if(!editorConfig || angular.isString(editorConfig)){ + editorConfig = tinyMceService.defaultPrevalues(); + } //config value on the data type var toolbar = editorConfig.toolbar.join(" | "); - assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope).then(function () { /** Loads in the editor */ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html index 51a07d5335..1bd0495864 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html @@ -1,3 +1,3 @@ -
            +
            \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js index acfa1c8711..17240666cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js @@ -1,15 +1,11 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController", function ($scope, $timeout, tinyMceService, stylesheetResource) { - var cfg = {}; - cfg.toolbar = ["code", "bold", "italic", "umbracocss","alignleft", "aligncenter", "alignright", "bullist","numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"]; - cfg.stylesheets = []; - cfg.dimensions = {height: 400, width: 600}; + var cfg = tinyMceService.defaultPrevalues(); if($scope.model.value){ if(angular.isString($scope.model.value)){ - $scope.model.value = angular.fromJson($scope.model.value); + $scope.model.value = cfg; } - angular.extend($scope.model.value, cfg); }else{ $scope.model.value = cfg; } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html index 407dc92578..28a3b68e3b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html @@ -1,6 +1,6 @@
            - +
            - +
            - + x Pixels - - {{model.value | json}} - - {{tinyMceConfig | json}} +
            \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js index 7465cc2197..f21e619915 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") -.controller("Umbraco.Editors.TagsController", +.controller("Umbraco.PropertyEditors.TagsController", function ($rootScope, $scope, $log, assetsService) { assetsService.loadJs( diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html index b1df58ed91..933857e78d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html @@ -1,4 +1,4 @@ -
            +
            diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js index 4d546ba690..255abd85f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js @@ -1,6 +1,6 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it -angular.module('umbraco').controller("Umbraco.Editors.EmbeddedContentController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.EmbeddedContentController", function($rootScope, $scope, $log){ $scope.showForm = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html index dd533b4287..113aeae349 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html @@ -1,4 +1,4 @@ -
            +
            • {{item[0].value}}... diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html index b17c59dea7..377f8e3db7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html @@ -1,2 +1,9 @@ - - \ No newline at end of file +
              + + + Required + +
              diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/ultrasimple/ultrasimple.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/ultrasimple/ultrasimple.html new file mode 100644 index 0000000000..76e31ecaa5 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/ultrasimple/ultrasimple.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js index 24a754b4f5..2a7462cc1b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js @@ -1,4 +1,4 @@ -angular.module('umbraco').controller("Umbraco.Editors.UrlListController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.UrlListController", function($rootScope, $scope, $filter) { function formatDisplayValue() { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html index 1653896c1a..d3561654b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html @@ -1,4 +1,4 @@ -
              +
              • {{value.url}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js index ef48de19f7..163f58dec6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js @@ -1,4 +1,4 @@ -angular.module('umbraco').controller("Umbraco.Editors.UserPickerController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.UserPickerController", function($rootScope, $scope, $log, userResource){ userResource.getAll().then(function (userArray) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html index d2fb30e34a..badfdbfd69 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html @@ -1,5 +1,5 @@ - <%=umbraco.ui.Text("cancel")%> - - \ No newline at end of file + <%=umbraco.ui.Text("cancel")%> + + diff --git a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs index 9949ee9bf6..5399f971f9 100644 --- a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs +++ b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs @@ -39,15 +39,6 @@ namespace Umbraco.Web.UI.Umbraco.Create { /// protected global::System.Web.UI.WebControls.ListBox PartialViewTemplate; - /// - /// CreateMacroCheckBox control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox CreateMacroCheckBox; - /// /// Textbox1 control. /// diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx index afca6cd0b6..a2c2a341bb 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx @@ -1,10 +1,24 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UserControlProxy.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dashboard.UserControlProxy" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs index 80d3584afb..19ac019a8f 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs @@ -12,6 +12,78 @@ namespace Umbraco.Web.UI.Umbraco.Dashboard { public partial class UserControlProxy { + /// + /// ClientLoader control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader; + + /// + /// CssInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; + + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + + /// + /// JsInclude3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude3; + + /// + /// JsInclude6 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude6; + + /// + /// JsInclude11 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude11; + + /// + /// JsInclude12 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude12; + + /// + /// JsInclude2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude2; + /// /// form1 control. /// diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index eafc514217..e41fc60541 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml index ce01881602..9b41676dd2 100644 --- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml @@ -22,7 +22,7 @@ -
                +
                diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml index d2fdcdb5ec..e96b9928d2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml +++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml @@ -324,7 +324,7 @@
                Macro
                - /Create/PartialView.ascx + /Create/PartialView.ascx @@ -362,4 +362,4 @@                 - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index ade3988213..6654ba0f28 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -83,7 +83,7 @@ Klik på musen for at redigere dette punkt Oprettet af Oprettet den - Dokumenttype + Dokumenttype Redigerer Nedtagningsdato Dette punkt er ændret siden udgivelsen diff --git a/src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx b/src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx index a7d1fb8de4..9e53aa3be7 100644 --- a/src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DLRScripting.ascx.cs" Inherits="umbraco.presentation.create.DLRScripting" %> +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="DlrScripting.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Create.DlrScripting" %> <%@ Import Namespace="umbraco" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> @@ -15,7 +15,7 @@ SelectionMode="Single" AutoPostBack="true" OnSelectedIndexChanged="loadTemplates"> - + diff --git a/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.cs b/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.cs new file mode 100644 index 0000000000..b5eb0bbaaa --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Umbraco.Web.UI.Umbraco.Create +{ + public partial class DlrScripting : global::umbraco.presentation.create.DLRScripting + { + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.designer.cs new file mode 100644 index 0000000000..4e944e9819 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/create/DlrScripting.ascx.designer.cs @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Umbraco.Web.UI.Umbraco.Create { + + + public partial class DlrScripting { + } +} diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx index b779f6854f..3ebd86181d 100644 --- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx @@ -1,27 +1,30 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="PartialViewMacro.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Create.PartialViewMacro" %> <%@ Import Namespace="umbraco" %> +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -Filename (without .cshtml): -* + + + + * + -<%----%> -
                - -
                -
                - Choose a template:
                - -
                + + + -
                - -
                + + + +                 -
                + +
                \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.designer.cs index 6d2bd58554..afe4f39e7c 100644 --- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.designer.cs +++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.designer.cs @@ -12,15 +12,6 @@ namespace Umbraco.Web.UI.Umbraco.Create { public partial class PartialViewMacro { - /// - /// RequiredFieldValidator1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1; - /// /// FileName control. /// @@ -30,6 +21,15 @@ namespace Umbraco.Web.UI.Umbraco.Create { /// protected global::System.Web.UI.WebControls.TextBox FileName; + /// + /// RequiredFieldValidator2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2; + /// /// PartialViewTemplate control. /// @@ -48,6 +48,15 @@ namespace Umbraco.Web.UI.Umbraco.Create { /// protected global::System.Web.UI.WebControls.CheckBox CreateMacroCheckBox; + /// + /// Textbox2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Textbox2; + /// /// SubmitButton control. /// diff --git a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx index f4c5fe64c8..857db84f9e 100644 --- a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="xslt.ascx.cs" Inherits="umbraco.presentation.create.xslt" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%> +<%@ Control Language="c#" AutoEventWireup="True" Codebehind="xslt.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Create.Xslt" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> @@ -7,7 +7,7 @@ *                 - + Clean diff --git a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.cs b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.cs new file mode 100644 index 0000000000..3ce9b817c2 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Umbraco.Web.UI.Umbraco.Create +{ + public partial class Xslt : global::umbraco.presentation.create.xslt + { + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.designer.cs new file mode 100644 index 0000000000..142e2a4fe3 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx.designer.cs @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Umbraco.Web.UI.Umbraco.Create { + + + public partial class Xslt { + } +} diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx index 127ecac644..f713f35bee 100644 --- a/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx +++ b/src/Umbraco.Web.UI/umbraco/dashboard/ExamineManagement.ascx @@ -28,15 +28,14 @@
                -
                -

                Examine Management

                - Examine Management - + +

                Examine Management

                +
                -

                Indexers

                +

                Indexers

                @@ -151,7 +150,7 @@
                -

                Searchers

                +

                Searchers

                @@ -212,7 +211,6 @@
                -
                diff --git a/src/Umbraco.Web.UI/umbraco/members/EditMemberType.aspx b/src/Umbraco.Web.UI/umbraco/members/EditMemberType.aspx index 3e274b567f..324f8fb0fa 100644 --- a/src/Umbraco.Web.UI/umbraco/members/EditMemberType.aspx +++ b/src/Umbraco.Web.UI/umbraco/members/EditMemberType.aspx @@ -13,20 +13,23 @@ - + + + + diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 76c1fe974e..c292b4ceb6 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -77,7 +77,7 @@ namespace Umbraco.Web.Editors }, { "treeApplicationApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( - controller => controller.GetApplicationTrees(null, null)) + controller => controller.GetApplicationTrees(null, null, null)) }, { "contentTypeApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 4c21914a5d..8d067b9643 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -67,7 +67,7 @@ namespace Umbraco.Web.Editors [FilterAllowedOutgoingContent(typeof(IEnumerable))] public IEnumerable GetByIds([FromUri]int[] ids) { - var foundContent = ((ContentService) Services.ContentService).GetByIds(ids); + var foundContent = Services.ContentService.GetByIds(ids); return foundContent.Select(Mapper.Map); } @@ -185,33 +185,7 @@ namespace Umbraco.Web.Editors // * any file attachments have been saved to their temporary location for us to use // * we have a reference to the DTO object and the persisted object // * Permissions are valid - - UpdateName(contentItem); - - //TODO: We need to support 'send to publish' - - //TODO: We'll need to save the new template, publishat, etc... values here - contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate; - contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate; - //only set the template if it didn't change - var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false) - || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias) - || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace()); - if (templateChanged) - { - var template = Services.FileService.GetTemplate(contentItem.TemplateAlias); - if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false) - { - //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias); - LogHelper.Warn("No template exists with the specified alias: " + contentItem.TemplateAlias); - } - else - { - //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template - contentItem.PersistedContent.Template = template; - } - } - + MapPropertyValues(contentItem); //We need to manually check the validation results here because: @@ -256,7 +230,7 @@ namespace Umbraco.Web.Editors else { //publish the item and check if it worked, if not we will show a diff msg below - publishStatus = ((ContentService)Services.ContentService).SaveAndPublishInternal(contentItem.PersistedContent, (int)Security.CurrentUser.Id); + publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, (int)Security.CurrentUser.Id); } @@ -282,6 +256,64 @@ namespace Umbraco.Web.Editors return display; } + /// + /// Maps the dto property values to the persisted model + /// + /// + private void MapPropertyValues(ContentItemSave contentItem) + { + UpdateName(contentItem); + + //TODO: We need to support 'send to publish' + + contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate; + contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate; + //only set the template if it didn't change + var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false) + || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias) + || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace()); + if (templateChanged) + { + var template = Services.FileService.GetTemplate(contentItem.TemplateAlias); + if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false) + { + //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias); + LogHelper.Warn("No template exists with the specified alias: " + contentItem.TemplateAlias); + } + else + { + //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template + contentItem.PersistedContent.Template = template; + } + } + + base.MapPropertyValues(contentItem); + } + + /// + /// Publishes a document with a given ID + /// + /// + /// + /// + /// The CanAccessContentAuthorize attribute will deny access to this method if the current user + /// does not have Publish access to this node. + /// + /// + [EnsureUserPermissionForContent("id", 'P')] + public HttpResponseMessage PostPublishById(int id) + { + var foundContent = Services.ContentService.GetById(id); + if (foundContent == null) + { + return HandleContentNotFound(id, false); + } + + Services.ContentService.Publish(foundContent, UmbracoUser.Id); + return Request.CreateResponse(HttpStatusCode.OK); + + } + /// /// Moves an item to the recycle bin, if it is already there then it will permanently delete it /// @@ -292,6 +324,7 @@ namespace Umbraco.Web.Editors /// does not have Delete access to this node. /// [EnsureUserPermissionForContent("id", 'D')] + [HttpDelete] public HttpResponseMessage DeleteById(int id) { //TODO: We need to check if the user is allowed to do this! @@ -323,7 +356,7 @@ namespace Umbraco.Web.Editors /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin /// [HttpDelete] - /* [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)]*/ + [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)] public HttpResponseMessage EmptyRecycleBin() { Services.ContentService.EmptyRecycleBin(); @@ -355,7 +388,7 @@ namespace Umbraco.Web.Editors var sortedContent = new List(); try { - sortedContent.AddRange(((ContentService) Services.ContentService).GetByIds(sorted.IdSortOrder)); + sortedContent.AddRange(Services.ContentService.GetByIds(sorted.IdSortOrder)); // Save content with new sort order and update content xml in db accordingly if (contentService.Sort(sortedContent) == false) @@ -532,11 +565,11 @@ namespace Umbraco.Web.Editors IUserService userService, IContentService contentService, int nodeId, - char permissionToCheck, + char? permissionToCheck = null, IContent contentItem = null) { - if (contentItem == null && nodeId != Constants.System.Root) + if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent) { contentItem = contentService.GetById(nodeId); //put the content item into storage so it can be retreived @@ -544,29 +577,41 @@ namespace Umbraco.Web.Editors storage[typeof(IContent).ToString()] = contentItem; } - if (contentItem == null && nodeId != Constants.System.Root) + if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent) { throw new HttpResponseException(HttpStatusCode.NotFound); } var hasPathAccess = (nodeId == Constants.System.Root) - ? UserExtensions.HasPathAccess("-1", user.StartContentId, Constants.System.RecycleBinContent) - : user.HasPathAccess(contentItem); + ? UserExtensions.HasPathAccess( + Constants.System.Root.ToInvariantString(), + user.StartContentId, + Constants.System.RecycleBinContent) + : (nodeId == Constants.System.RecycleBinContent) + ? UserExtensions.HasPathAccess( + Constants.System.RecycleBinContent.ToInvariantString(), + user.StartContentId, + Constants.System.RecycleBinContent) + : user.HasPathAccess(contentItem); if (hasPathAccess == false) { return false; } - var permission = userService.GetPermissions(user, nodeId).FirstOrDefault(); - if (permission == null || permission.AssignedPermissions.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture))) + if (permissionToCheck.HasValue == false) { return true; } - else + + var permission = userService.GetPermissions(user, nodeId).FirstOrDefault(); + + if (permission != null && permission.AssignedPermissions.Contains(permissionToCheck.Value.ToString(CultureInfo.InvariantCulture))) { - return false; + return true; } + + return false; } } diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs index e7508f0b12..14a15b7415 100644 --- a/src/Umbraco.Web/Editors/ContentControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs @@ -78,7 +78,12 @@ namespace Umbraco.Web.Editors return null; } - protected void MapPropertyValues(ContentBaseItemSave contentItem) + /// + /// Maps the dto property values to the persisted model + /// + /// + /// + protected virtual void MapPropertyValues(ContentBaseItemSave contentItem) where TPersisted : IContentBase { //Map the property values diff --git a/src/Umbraco.Web/Editors/DashboardSecurity.cs b/src/Umbraco.Web/Editors/DashboardSecurity.cs index ea6d46c514..a24756f475 100644 --- a/src/Umbraco.Web/Editors/DashboardSecurity.cs +++ b/src/Umbraco.Web/Editors/DashboardSecurity.cs @@ -14,7 +14,7 @@ namespace Umbraco.Web.Editors { //TODO: Unit test all this!!! :/ - public static bool AuthorizeAccess(ISection dashboardSection, IUser user, SectionService sectionService) + public static bool AuthorizeAccess(ISection dashboardSection, IUser user, ISectionService sectionService) { if (user.Id.ToString() == 0.ToInvariantString()) { @@ -28,7 +28,7 @@ namespace Umbraco.Web.Editors return CheckUserAccessByRules(user, sectionService, denyTypes, grantedTypes, grantedBySectionTypes); } - public static bool AuthorizeAccess(IDashboardTab dashboardTab, IUser user, SectionService sectionService) + public static bool AuthorizeAccess(IDashboardTab dashboardTab, IUser user, ISectionService sectionService) { if (user.Id.ToString() == Constants.System.Root.ToInvariantString()) { @@ -42,7 +42,7 @@ namespace Umbraco.Web.Editors return CheckUserAccessByRules(user, sectionService, denyTypes, grantedTypes, grantedBySectionTypes); } - public static bool AuthorizeAccess(IDashboardControl dashboardTab, IUser user, SectionService sectionService) + public static bool AuthorizeAccess(IDashboardControl dashboardTab, IUser user, ISectionService sectionService) { if (user.Id.ToString() == Constants.System.Root.ToInvariantString()) { @@ -56,7 +56,7 @@ namespace Umbraco.Web.Editors return CheckUserAccessByRules(user, sectionService, denyTypes, grantedTypes, grantedBySectionTypes); } - public static bool CheckUserAccessByRules(IUser user, SectionService sectionService, IAccessItem[] denyTypes, IAccessItem[] grantedTypes, IAccessItem[] grantedBySectionTypes) + public static bool CheckUserAccessByRules(IUser user, ISectionService sectionService, IAccessItem[] denyTypes, IAccessItem[] grantedTypes, IAccessItem[] grantedBySectionTypes) { var allowedSoFar = false; diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index 06c2722630..902eb976d7 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -107,7 +107,7 @@ namespace Umbraco.Web.Editors //If we've made it here, then everything has been wired up and validated by the attribute //finally we need to save the data type and it's pre-vals - var dtService = (DataTypeService) ApplicationContext.Services.DataTypeService; + var dtService = ApplicationContext.Services.DataTypeService; //TODO: Check if the property editor has changed, if it has ensure we don't pass the // existing values to the new property editor! diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index a3e39692f3..64f79b5355 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -34,20 +34,12 @@ namespace Umbraco.Web.Editors public class EntityController : UmbracoAuthorizedJsonController { [HttpGet] - public IEnumerable Search([FromUri] string query, UmbracoEntityTypes type) + public ISearchResults Search([FromUri] string query, UmbracoEntityTypes type) { if (string.IsNullOrEmpty(query)) return null; - switch (type) - { - case UmbracoEntityTypes.Document: - return ExamineSearch(query, true); - case UmbracoEntityTypes.Media: - return ExamineSearch(query, false); - default: - throw new NotSupportedException("The " + typeof(EntityController) + " currently does not support searching against object type " + type); - } + return ExamineSearch(query, type); } /// @@ -92,24 +84,46 @@ namespace Umbraco.Web.Editors return GetResultForAll(type, postFilter, postFilterParams); } - private IEnumerable ExamineSearch(string query, bool isContent) + private ISearchResults ExamineSearch(string query, UmbracoEntityTypes entityType) { - //TODO: WE should really just allow passing in a lucene raw query - - var internalSearcher = ExamineManager.Instance.SearchProviderCollection[Constants.Examine.InternalSearcher]; - var criteria = internalSearcher.CreateSearchCriteria(isContent ? "content" : "media", BooleanOperation.Or); + var searcher = Constants.Examine.InternalSearcher; + var type = "content"; var fields = new[] { "id", "__nodeName", "bodyText" }; + //TODO: WE should really just allow passing in a lucene raw query + switch (entityType) + { + case UmbracoEntityTypes.Member: + searcher = Constants.Examine.InternalMemberSearcher; + type = "member"; + fields = new[] { "id", "email", "login","name", "nodename"}; + break; + case UmbracoEntityTypes.Media: + type = "media"; + break; + case UmbracoEntityTypes.Document: + break; + default: + throw new NotSupportedException("The " + typeof(EntityController) + " currently does not support searching against object type " + entityType); + + } + + var internalSearcher = ExamineManager.Instance.SearchProviderCollection[searcher]; + var criteria = internalSearcher.CreateSearchCriteria(type, BooleanOperation.Or); + var term = new[] { query.ToLower().Escape() }; var operation = criteria.GroupedOr(fields, term).Compile(); + return internalSearcher.Search(operation); + + /* var results = internalSearcher.Search(operation) .Select(x => int.Parse(x["id"])); //TODO: Just create a basic entity from the results!! why double handling and going to the database... this will be ultra slow. - return GetResultForIds(results.ToArray(), isContent ? UmbracoEntityTypes.Document : UmbracoEntityTypes.Media) - .WhereNotNull(); + return GetResultForIds(results.ToArray(), entityType) + .WhereNotNull();*/ } private IEnumerable GetResultForChildren(int id, UmbracoEntityTypes entityType) diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 4261e65607..d2aca4f1c5 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -178,7 +178,7 @@ namespace Umbraco.Web.Editors [FilterAllowedOutgoingMedia(typeof(IEnumerable))] public IEnumerable GetByIds([FromUri]int[] ids) { - var foundMedia = ((MediaService)Services.MediaService).GetByIds(ids); + var foundMedia = Services.MediaService.GetByIds(ids); return foundMedia.Select(Mapper.Map); } @@ -287,8 +287,6 @@ namespace Umbraco.Web.Editors // * we have a reference to the DTO object and the persisted object // * Permissions are valid - UpdateName(contentItem); - MapPropertyValues(contentItem); //We need to manually check the validation results here because: @@ -331,6 +329,18 @@ namespace Umbraco.Web.Editors return display; } + /// + /// Maps the property values to the persisted entity + /// + /// + protected override void MapPropertyValues(ContentBaseItemSave contentItem) + { + UpdateName(contentItem); + + //use the base method to map the rest of the properties + base.MapPropertyValues(contentItem); + } + /// /// Change the sort order for media /// @@ -464,7 +474,7 @@ namespace Umbraco.Web.Editors /// internal static bool CheckPermissions(IDictionary storage, IUser user, IMediaService mediaService, int nodeId, IMedia media = null) { - if (media == null && nodeId != Constants.System.Root) + if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia) { media = mediaService.GetById(nodeId); //put the content item into storage so it can be retreived @@ -472,14 +482,22 @@ namespace Umbraco.Web.Editors storage[typeof(IMedia).ToString()] = media; } - if (media == null && nodeId != Constants.System.Root) + if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia) { throw new HttpResponseException(HttpStatusCode.NotFound); } var hasPathAccess = (nodeId == Constants.System.Root) - ? UserExtensions.HasPathAccess("-1", user.StartMediaId, Constants.System.RecycleBinMedia) - : user.HasPathAccess(media); + ? UserExtensions.HasPathAccess( + Constants.System.Root.ToInvariantString(), + user.StartMediaId, + Constants.System.RecycleBinMedia) + : (nodeId == Constants.System.RecycleBinMedia) + ? UserExtensions.HasPathAccess( + Constants.System.RecycleBinMedia.ToInvariantString(), + user.StartMediaId, + Constants.System.RecycleBinMedia) + : user.HasPathAccess(media); return hasPathAccess; } diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 9ce07c1fa5..8ad5f68422 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -1,16 +1,20 @@ using System; using System.Collections.Generic; -using System.Linq; +using System.ComponentModel.DataAnnotations; using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ModelBinding; +using System.Web.Security; using AutoMapper; using Examine.LuceneEngine.SearchCriteria; using Examine.SearchCriteria; +using Umbraco.Core; +using Umbraco.Core.Logging; using Umbraco.Core.Models; +using Umbraco.Core.Models.EntityBase; using Umbraco.Web.WebApi; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; @@ -19,8 +23,6 @@ using Umbraco.Web.WebApi.Filters; using umbraco; using Constants = Umbraco.Core.Constants; using Examine; -using System.Web.Security; -using Member = umbraco.cms.businesslogic.member.Member; namespace Umbraco.Web.Editors { @@ -37,7 +39,7 @@ namespace Umbraco.Web.Editors /// public MemberController() : this(UmbracoContext.Current) - { + { } /// @@ -56,7 +58,7 @@ namespace Umbraco.Web.Editors /// public MemberDisplay GetByKey(Guid key) { - if (Member.InUmbracoMemberMode()) + if (Membership.Provider.Name == Constants.Conventions.Member.UmbracoMemberProviderName) { var foundMember = Services.MemberService.GetByKey(key); if (foundMember == null) @@ -70,7 +72,24 @@ namespace Umbraco.Web.Editors //TODO: Support this throw new HttpResponseException(Request.CreateValidationErrorResponse("Editing member with a non-umbraco membership provider is currently not supported")); } - + + } + + /// + /// Gets an empty content item for the + /// + /// + /// + public MemberDisplay GetEmpty(string contentTypeAlias) + { + var contentType = Services.MemberTypeService.GetMemberType(contentTypeAlias); + if (contentType == null) + { + throw new HttpResponseException(HttpStatusCode.NotFound); + } + + var emptyContent = new Core.Models.Member("", contentType); + return Mapper.Map(emptyContent); } /// @@ -78,10 +97,16 @@ namespace Umbraco.Web.Editors /// /// [FileUploadCleanupFilter] + [MembershipProviderValidationFilter] public MemberDisplay PostSave( [ModelBinder(typeof(MemberBinder))] MemberSave contentItem) { + if (Membership.Provider.Name != Constants.Conventions.Member.UmbracoMemberProviderName) + { + throw new NotSupportedException("Currently the member editor does not support providers that are not the default Umbraco membership provider "); + } + //If we've reached here it means: // * Our model has been bound // * and validated @@ -89,35 +114,53 @@ namespace Umbraco.Web.Editors // * we have a reference to the DTO object and the persisted object // * Permissions are valid - UpdateName(contentItem); - - //map the custom properties - contentItem.PersistedContent.Email = contentItem.Email; - //TODO: If we allow changing the alias then we'll need to change URLs, etc... in the editor, would prefer to use - // a unique id but then need to figure out how to handle that with custom membership providers - waiting on feedback from morten. - + //map the properties to the persisted entity MapPropertyValues(contentItem); - //We need to manually check the validation results here because: - // * We still need to save the entity even if there are validation value errors - // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null) - // then we cannot continue saving, we can only display errors - // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display - // a message indicating this - if (!ModelState.IsValid) + //Unlike content/media - if there are errors for a member, we do NOT proceed to save them, we cannot so return the errors + if (ModelState.IsValid == false) { - if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) - && (contentItem.Action == ContentSaveAction.SaveNew)) - { - //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue! - // add the modelstate to the outgoing object and throw validation response - var forDisplay = Mapper.Map(contentItem.PersistedContent); - forDisplay.Errors = ModelState.ToErrorDictionary(); - throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay)); - } + var forDisplay = Mapper.Map(contentItem.PersistedContent); + forDisplay.Errors = ModelState.ToErrorDictionary(); + throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay)); + } + + //TODO: WE need to support this! - requires UI updates, etc... + if (Membership.Provider.RequiresQuestionAndAnswer) + { + throw new NotSupportedException("Currently the member editor does not support providers that have RequiresQuestionAndAnswer specified"); + } + + //Depending on the action we need to first do a create or update using the membership provider + // this ensures that passwords are formatted correclty and also performs the validation on the provider itself. + switch (contentItem.Action) + { + case ContentSaveAction.Save: + UpdateWithMembershipProvider(contentItem); + break; + case ContentSaveAction.SaveNew: + MembershipCreateStatus status; + CreateWithUmbracoProvider(contentItem, out status); + break; + default: + //we don't support anything else for members + throw new HttpResponseException(HttpStatusCode.NotFound); + } + + //If we've had problems creating/updating the user with the provider then return the error + if (ModelState.IsValid == false) + { + var forDisplay = Mapper.Map(contentItem.PersistedContent); + forDisplay.Errors = ModelState.ToErrorDictionary(); + throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay)); } //save the item + //NOTE: We are setting the password to NULL - this indicates to the system to not actually save the password + // so it will not get overwritten! + contentItem.PersistedContent.Password = null; + + //create/save the IMember Services.MemberService.Save(contentItem.PersistedContent); //return the updated model @@ -138,6 +181,279 @@ namespace Umbraco.Web.Editors return display; } + /// + /// Maps the property values to the persisted entity + /// + /// + private void MapPropertyValues(MemberSave contentItem) + { + UpdateName(contentItem); + + //map the custom properties - this will already be set for new entities in our member binder + contentItem.PersistedContent.Email = contentItem.Email; + contentItem.PersistedContent.Username = contentItem.Username; + + //use the base method to map the rest of the properties + base.MapPropertyValues(contentItem); + } + + /// + /// Update the membership user using the membership provider (for things like email, etc...) + /// If a password change is detected then we'll try that too. + /// + /// + /// + /// + /// YES! It is completely insane how many options you have to take into account based on the membership provider. yikes! + /// + /// TODO: We need to update this method to return the new password if it has been reset and then show that to the UI! + /// + /// + private void UpdateWithMembershipProvider(MemberSave contentItem) + { + //Get the member from the provider + var membershipUser = Membership.Provider.GetUser(contentItem.PersistedContent.Username, false); + if (membershipUser == null) + { + //This should never happen! so we'll let it YSOD if it does. + throw new InvalidOperationException("Could not get member from membership provider " + Membership.Provider.Name + " with username " + contentItem.PersistedContent.Username); + } + + //ok, first thing to do is check if they've changed their email + //TODO: When we support the other membership provider data then we'll check if any of that's changed too. + if (contentItem.Email.Trim().InvariantEquals(membershipUser.Email) == false) + { + membershipUser.Email = contentItem.Email.Trim(); + + try + { + Membership.Provider.UpdateUser(membershipUser); + } + catch (Exception ex) + { + LogHelper.WarnWithException("Could not update member, the provider returned an error", ex); + ModelState.AddPropertyError( + //specify 'default' just so that it shows up as a notification - is not assigned to a property + new ValidationResult("Could not update member, the provider returned an error: " + ex.Message + " (see log for full details)"), "default"); + } + } + + //password changes ? + if (contentItem.Password == null) return; + + //Are we resetting the password?? + if (contentItem.Password.Reset.HasValue && contentItem.Password.Reset.Value) + { + if (Membership.Provider.EnablePasswordReset == false) + { + ModelState.AddPropertyError( + new ValidationResult("Password reset is not enabled", new[] { "resetPassword" }), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + else if (Membership.Provider.RequiresQuestionAndAnswer && contentItem.Password.Answer.IsNullOrWhiteSpace()) + { + ModelState.AddPropertyError( + new ValidationResult("Password reset requires a password answer", new[] {"resetPassword"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + else + { + //ok, we should be able to reset it + try + { + var newPass = Membership.Provider.ResetPassword( + membershipUser.UserName, + Membership.Provider.RequiresQuestionAndAnswer ? contentItem.Password.Answer : null); + + //TODO: How do we show this new password to the front-end ??? + } + catch (Exception ex) + { + LogHelper.WarnWithException("Could not reset member password", ex); + ModelState.AddPropertyError( + new ValidationResult("Could not reset password, error: " + ex.Message + " (see log for full details)", new[] {"resetPassword"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + } + } + else if (contentItem.Password.NewPassword.IsNullOrWhiteSpace() == false) + { + //we're not resetting it so we need to try to change it. + + if (contentItem.Password.OldPassword.IsNullOrWhiteSpace() && Membership.Provider.EnablePasswordRetrieval == false) + { + //if password retrieval is not enabled but there is no old password we cannot continue + + ModelState.AddPropertyError( + new ValidationResult("Password cannot be changed without the old password", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + else if (contentItem.Password.OldPassword.IsNullOrWhiteSpace() == false) + { + //if an old password is suplied try to change it + + try + { + var result = Membership.Provider.ChangePassword(membershipUser.UserName, contentItem.Password.OldPassword, contentItem.Password.NewPassword); + if (result == false) + { + ModelState.AddPropertyError( + new ValidationResult("Could not change password", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + } + catch (Exception ex) + { + LogHelper.WarnWithException("Could not change member password", ex); + ModelState.AddPropertyError( + new ValidationResult("Could not change password, error: " + ex.Message + " (see log for full details)", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + } + else if (Membership.Provider.EnablePasswordRetrieval == false) + { + //we cannot continue if we cannot get the current password + + ModelState.AddPropertyError( + new ValidationResult("Password cannot be changed without the old password", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + else if (Membership.Provider.RequiresQuestionAndAnswer && contentItem.Password.Answer.IsNullOrWhiteSpace()) + { + //if the question answer is required but there isn't one, we cannot continue + + ModelState.AddPropertyError( + new ValidationResult("Password cannot be changed without the password answer", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + + } + else + { + //lets try to get the old one so we can change it + + try + { + var oldPassword = Membership.Provider.GetPassword( + membershipUser.UserName, + Membership.Provider.RequiresQuestionAndAnswer ? contentItem.Password.Answer : null); + + try + { + var result = Membership.Provider.ChangePassword(membershipUser.UserName, oldPassword, contentItem.Password.NewPassword); + if (result == false) + { + ModelState.AddPropertyError( + new ValidationResult("Could not change password", new[] {"value"}), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + } + catch (Exception ex1) + { + LogHelper.WarnWithException("Could not change member password", ex1); + ModelState.AddPropertyError( + new ValidationResult("Could not change password, error: " + ex1.Message + " (see log for full details)", new[] { "value" }), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + + } + catch (Exception ex2) + { + LogHelper.WarnWithException("Could not retrieve member password", ex2); + ModelState.AddPropertyError( + new ValidationResult("Could not change password, error: " + ex2.Message + " (see log for full details)", new[] { "value" }), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + + } + } + } + + /// + /// This is going to create the user with the membership provider and check for validation + /// + /// + /// + /// + /// + /// If this is successful, it will go and re-fetch the IMember from the db because it will now have an ID because the Umbraco provider + /// uses the umbraco data store - then of course we need to re-map it to the saved property values. + /// + private MembershipUser CreateWithUmbracoProvider(MemberSave contentItem, out MembershipCreateStatus status) + { + //if we are creating a new one, create the member using the membership provider first + + //TODO: I think we should detect if the Umbraco membership provider is active, if so then we'll create the member first and the provider key doesn't matter + // but if we are using a 3rd party membership provider - then we should create our IMember first and use it's key as their provider user key! + + //NOTE: We are casting directly to the umbraco membership provider so we can specify the member type that we want to use! + + var umbracoMembershipProvider = (global::umbraco.providers.members.UmbracoMembershipProvider)Membership.Provider; + var membershipUser = umbracoMembershipProvider.CreateUser( + contentItem.ContentTypeAlias, contentItem.Username, + contentItem.Password.NewPassword, + contentItem.Email, "", "", true, Guid.NewGuid(), out status); + + //TODO: Localize these! + switch (status) + { + case MembershipCreateStatus.Success: + + //Go and re-fetch the persisted item + contentItem.PersistedContent = Services.MemberService.GetByUsername(contentItem.Username.Trim()); + //remap the values to save + MapPropertyValues(contentItem); + + break; + case MembershipCreateStatus.InvalidUserName: + ModelState.AddPropertyError( + new ValidationResult("Invalid user name", new[] { "value" }), + string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case MembershipCreateStatus.InvalidPassword: + ModelState.AddPropertyError( + new ValidationResult("Invalid password", new[] { "value" }), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case MembershipCreateStatus.InvalidQuestion: + case MembershipCreateStatus.InvalidAnswer: + throw new NotSupportedException("Currently the member editor does not support providers that have RequiresQuestionAndAnswer specified"); + case MembershipCreateStatus.InvalidEmail: + ModelState.AddPropertyError( + new ValidationResult("Invalid email", new[] { "value" }), + string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case MembershipCreateStatus.DuplicateUserName: + ModelState.AddPropertyError( + new ValidationResult("Username is already in use", new[] { "value" }), + string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case MembershipCreateStatus.DuplicateEmail: + ModelState.AddPropertyError( + new ValidationResult("Email address is already in use", new[] { "value" }), + string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case MembershipCreateStatus.InvalidProviderUserKey: + ModelState.AddPropertyError( + //specify 'default' just so that it shows up as a notification - is not assigned to a property + new ValidationResult("Invalid provider user key"), "default"); + break; + case MembershipCreateStatus.DuplicateProviderUserKey: + ModelState.AddPropertyError( + //specify 'default' just so that it shows up as a notification - is not assigned to a property + new ValidationResult("Duplicate provider user key"), "default"); + break; + case MembershipCreateStatus.ProviderError: + case MembershipCreateStatus.UserRejected: + ModelState.AddPropertyError( + //specify 'default' just so that it shows up as a notification - is not assigned to a property + new ValidationResult("User could not be created (rejected by provider)"), "default"); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + return membershipUser; + } /// /// Permanently deletes a member diff --git a/src/Umbraco.Web/Editors/MembershipProviderValidationFilterAttribute.cs b/src/Umbraco.Web/Editors/MembershipProviderValidationFilterAttribute.cs new file mode 100644 index 0000000000..71943baea2 --- /dev/null +++ b/src/Umbraco.Web/Editors/MembershipProviderValidationFilterAttribute.cs @@ -0,0 +1,132 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Net; +using System.Web.Http; +using System.Web.Http.Controllers; +using System.Web.Http.Filters; +using System.Web.Security; +using Umbraco.Core; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Editors +{ + /// + /// This validates the submitted data in regards to the current membership provider + /// + internal class MembershipProviderValidationFilterAttribute : ActionFilterAttribute + { + public override void OnActionExecuting(HttpActionContext actionContext) + { + base.OnActionExecuting(actionContext); + + //default provider! + var membershipProvider = Membership.Provider; + + var contentItem = (MemberSave) actionContext.ActionArguments["contentItem"]; + + var validEmail = ValidateUniqueEmail(contentItem, membershipProvider, actionContext); + if (validEmail == false) + { + actionContext.ModelState.AddPropertyError( + new ValidationResult("Email address is already in use", new[] {"value"}), + string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + + var validLogin = ValidateUniqueLogin(contentItem, membershipProvider, actionContext); + if (validLogin == false) + { + actionContext.ModelState.AddPropertyError( + new ValidationResult("Username is already in use", new[] { "value" }), + string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + } + } + + internal bool ValidateUniqueLogin(MemberSave contentItem, MembershipProvider membershipProvider, HttpActionContext actionContext) + { + if (contentItem == null) throw new ArgumentNullException("contentItem"); + if (membershipProvider == null) throw new ArgumentNullException("membershipProvider"); + + int totalRecs; + var existingByEmail = membershipProvider.FindUsersByName(contentItem.Username.Trim(), 0, int.MaxValue, out totalRecs); + switch (contentItem.Action) + { + case ContentSaveAction.Save: + + if (contentItem.PersistedContent.Email.InvariantEquals(contentItem.Email.Trim()) == false) + { + //they are changing their login name + if (existingByEmail.Cast().Select(x => x.UserName) + .Any(x => x == contentItem.Username.Trim())) + { + //the user cannot use this login + return false; + } + } + break; + case ContentSaveAction.SaveNew: + //check if the user's login already exists + if (existingByEmail.Cast().Select(x => x.UserName) + .Any(x => x == contentItem.Username.Trim())) + { + //the user cannot use this login + return false; + } + break; + case ContentSaveAction.Publish: + case ContentSaveAction.PublishNew: + default: + //we don't support this for members + throw new HttpResponseException(HttpStatusCode.NotFound); + } + + return true; + } + + internal bool ValidateUniqueEmail(MemberSave contentItem, MembershipProvider membershipProvider, HttpActionContext actionContext) + { + if (contentItem == null) throw new ArgumentNullException("contentItem"); + if (membershipProvider == null) throw new ArgumentNullException("membershipProvider"); + + if (membershipProvider.RequiresUniqueEmail == false) + { + return true; + } + + int totalRecs; + var existingByEmail = membershipProvider.FindUsersByEmail(contentItem.Email.Trim(), 0, int.MaxValue, out totalRecs); + switch (contentItem.Action) + { + case ContentSaveAction.Save: + //ok, we're updating the member, we need to check if they are changing their email and if so, does it exist already ? + if (contentItem.PersistedContent.Email.InvariantEquals(contentItem.Email.Trim()) == false) + { + //they are changing their email + if (existingByEmail.Cast().Select(x => x.Email) + .Any(x => x.InvariantEquals(contentItem.Email.Trim()))) + { + //the user cannot use this email + return false; + } + } + break; + case ContentSaveAction.SaveNew: + //check if the user's email already exists + if (existingByEmail.Cast().Select(x => x.Email) + .Any(x => x.InvariantEquals(contentItem.Email.Trim()))) + { + //the user cannot use this email + return false; + } + break; + case ContentSaveAction.Publish: + case ContentSaveAction.PublishNew: + default: + //we don't support this for members + throw new HttpResponseException(HttpStatusCode.NotFound); + } + + return true; + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs index 964b7712b4..b656f87e5a 100644 --- a/src/Umbraco.Web/ModelStateExtensions.cs +++ b/src/Umbraco.Web/ModelStateExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Mvc; @@ -48,6 +49,32 @@ namespace Umbraco.Web // state.AddModelError("DataValidation", errorMessage); //} + /// + /// Adds the error to model state correctly for a property so we can use it on the client side. + /// + /// + /// + /// + internal static void AddPropertyError(this System.Web.Http.ModelBinding.ModelStateDictionary modelState, ValidationResult result, string propertyAlias) + { + //if there are no member names supplied then we assume that the validation message is for the overall property + // not a sub field on the property editor + if (!result.MemberNames.Any()) + { + //add a model state error for the entire property + modelState.AddModelError(string.Format("{0}.{1}", "Properties", propertyAlias), result.ErrorMessage); + } + else + { + //there's assigned field names so we'll combine the field name with the property name + // so that we can try to match it up to a real sub field of this editor + foreach (var field in result.MemberNames) + { + modelState.AddModelError(string.Format("{0}.{1}.{2}", "Properties", propertyAlias, field), result.ErrorMessage); + } + } + } + public static IDictionary ToErrorDictionary(this System.Web.Http.ModelBinding.ModelStateDictionary modelState) { var modelStateError = new Dictionary(); diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs index 560f997bde..a485596830 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs @@ -21,7 +21,10 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "createDate")] public DateTime CreateDate { get; set; } - + + [DataMember(Name = "published")] + public bool Published { get; set; } + [DataMember(Name = "owner")] public UserBasic Owner { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs index d07955060f..8c3513e6e1 100644 --- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs +++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs @@ -23,6 +23,9 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "icon")] public string Icon { get; set; } + [DataMember(Name = "key")] + public Guid Key { get; set; } + [DataMember(Name = "parentId", IsRequired = true)] [Required] public int ParentId { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs index 27a4eaca0f..48c6a43322 100644 --- a/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs @@ -1,4 +1,5 @@ -using System.Runtime.Serialization; +using System; +using System.Runtime.Serialization; using Umbraco.Core.Models; namespace Umbraco.Web.Models.ContentEditing @@ -16,5 +17,11 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "email")] public string Email { get; set; } + /// + /// This is the unique Id stored in the database - but could also be the unique id for a custom membership provider + /// + [DataMember(Name = "key")] + public Guid Key { get; set; } + } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberPassword.cs b/src/Umbraco.Web/Models/ContentEditing/MemberPassword.cs new file mode 100644 index 0000000000..3a1c67842c --- /dev/null +++ b/src/Umbraco.Web/Models/ContentEditing/MemberPassword.cs @@ -0,0 +1,37 @@ +using System.Runtime.Serialization; + +namespace Umbraco.Web.Models.ContentEditing +{ + /// + /// A model representing the data required to set a member/user password depending on the provider installed. + /// + public class MemberPassword + { + /// + /// The password value + /// + /// + /// This + /// + [DataMember(Name = "newPassword")] + public string NewPassword { get; set; } + + /// + /// The old password - used to change a password when: EnablePasswordRetrieval = false + /// + [DataMember(Name = "oldPassword")] + public string OldPassword { get; set; } + + /// + /// Set to true if the password is to be reset - only valid when: EnablePasswordReset = true + /// + [DataMember(Name = "reset")] + public bool? Reset { get; set; } + + /// + /// The password answer - required for reset when: RequiresQuestionAndAnswer = true + /// + [DataMember(Name = "answer")] + public string Answer { get; set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs index 8de5f3647c..ace4d576f9 100644 --- a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs +++ b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs @@ -1,4 +1,5 @@ using System.Runtime.Serialization; +using Newtonsoft.Json.Linq; using Umbraco.Core.Models; using Umbraco.Core.Models.Validation; @@ -9,6 +10,11 @@ namespace Umbraco.Web.Models.ContentEditing /// public class MemberSave : ContentBaseItemSave { + public MemberSave() + { + Password = new MemberPassword(); + } + [DataMember(Name = "username", IsRequired = true)] [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")] public string Username { get; set; } @@ -16,8 +22,8 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "email", IsRequired = true)] [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")] public string Email { get; set; } - - [DataMember(Name = "password")] - public string Password { get; set; } + + [DataMember(Name = "password")] + public MemberPassword Password { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs index b424751715..b5d68fed21 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs @@ -28,6 +28,7 @@ namespace Umbraco.Web.Models.Mapping display.Alias = originalProp.Alias; display.Description = originalProp.PropertyType.Description; display.Label = originalProp.PropertyType.Name; + display.HideLabel = display.PropertyEditor.ValueEditor.HideLabel; var dataTypeService = _dataTypeService.Value; diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs index 4a0edcf7f8..6c6dce65c1 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.Models.Mapping { var propertyDto = base.ConvertCore(originalProperty); - var dataTypeService = (DataTypeService)_dataTypeService.Value; + var dataTypeService = _dataTypeService.Value; propertyDto.IsRequired = originalProperty.PropertyType.Mandatory; propertyDto.ValidationRegExp = originalProperty.PropertyType.ValidationRegExp; diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 001296792f..da490d6f31 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -1,4 +1,6 @@ -using AutoMapper; +using System.Collections.Generic; +using System.Web.Security; +using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; @@ -53,7 +55,9 @@ namespace Umbraco.Web.Models.Mapping config.CreateMap>() .ForMember( dto => dto.Owner, - expression => expression.ResolveUsing>()); + expression => expression.ResolveUsing>()) + //do no map the custom member properties (currently anyways, they were never there in 6.x) + .ForMember(dto => dto.Properties, expression => expression.ResolveUsing()); } /// @@ -63,6 +67,8 @@ namespace Umbraco.Web.Models.Mapping /// private static void MapGenericCustomProperties(IMember member, MemberDisplay display) { + var membershipProvider = Membership.Provider; + TabsAndPropertiesResolver.MapGenericProperties( member, display, new ContentPropertyDisplay @@ -70,24 +76,53 @@ namespace Umbraco.Web.Models.Mapping Alias = string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix), Label = ui.Text("login"), Value = display.Username, - View = "textbox" + View = "textbox", + Config = new Dictionary { { "IsRequired", true } } }, new ContentPropertyDisplay { Alias = string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix), Label = ui.Text("password"), Value = "", - View = "changepassword" //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor + View = "changepassword",//TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor + Config = new Dictionary + { + //the password change toggle will only be displayed if there is already a password assigned. + { "hasPassword", member.Password.IsNullOrWhiteSpace() == false }, + { "minPasswordLength", membershipProvider.MinRequiredPasswordLength }, + { "enableReset", membershipProvider.EnablePasswordReset }, + { "enablePasswordRetrieval" , membershipProvider.EnablePasswordRetrieval }, + { "requiresQuestionAnswer", membershipProvider.RequiresQuestionAndAnswer } + //TODO: Inject the other parameters in here to change the behavior of this control - based on the membership provider settings. + } }, new ContentPropertyDisplay { Alias = string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix), Label = ui.Text("general", "email"), Value = display.Email, - View = "textbox" + View = "email", + Config = new Dictionary {{"IsRequired", true}} }); } + /// + /// This ensures that the custom membership provider properties are not mapped (currently since they weren't there in v6) + /// + /// + /// Because these properties don't exist on the form, if we don't remove them for this map we'll get validation errors when posting data + /// + internal class MemberDtoPropertiesValueResolver : ValueResolver> + { + protected override IEnumerable ResolveCore(IMember source) + { + var exclude = Constants.Conventions.Member.StandardPropertyTypeStubs.Select(x => x.Value.Alias).ToArray(); + return source.Properties + .Where(x => exclude.Contains(x.Alias) == false) + .Select(Mapper.Map); + } + } + } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/Mapping/SectionModelMapper.cs b/src/Umbraco.Web/Models/Mapping/SectionModelMapper.cs index ad32628508..20dfa544ac 100644 --- a/src/Umbraco.Web/Models/Mapping/SectionModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/SectionModelMapper.cs @@ -2,6 +2,7 @@ using Umbraco.Core; using Umbraco.Core.Models.Mapping; using Umbraco.Web.Models.ContentEditing; +using umbraco; namespace Umbraco.Web.Models.Mapping { @@ -10,6 +11,9 @@ namespace Umbraco.Web.Models.Mapping public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext) { config.CreateMap() + .ForMember( + dto => dto.Name, + expression => expression.MapFrom(section => ui.Text("sections", section.Alias))) .ReverseMap(); //backwards too! } } diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs index a8b37bf71f..ef22fecb91 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs @@ -41,9 +41,9 @@ namespace Umbraco.Web.Models.Mapping /// setting up the properties such as Created date, udpated date, template selected, etc... /// public static void MapGenericProperties( - TPersisted content, + TPersisted content, ContentItemDisplayBase display, - params ContentPropertyDisplay[] customProperties) + params ContentPropertyDisplay[] customProperties) where TPersisted : IContentBase { @@ -105,6 +105,7 @@ namespace Umbraco.Web.Models.Mapping //re-assign genericProps.Properties = contentProps; + } protected override IEnumerable> ResolveCore(IContentBase content) @@ -141,7 +142,7 @@ namespace Umbraco.Web.Models.Mapping { Id = rootGroup.Id, Alias = rootGroup.Name, - Label = rootGroup.Name, + Label = TranslateTab(rootGroup.Name), Properties = aggregateProperties, IsActive = false }); @@ -155,16 +156,45 @@ namespace Umbraco.Web.Models.Mapping aggregateTabs.Add(new Tab { Id = 0, - Label = "Generic properties", + Label = ui.Text("general", "properties"), Alias = "Generic properties", Properties = Mapper.Map, IEnumerable>(orphanProperties) }); - + //set the first tab to active aggregateTabs.First().IsActive = true; return aggregateTabs; } + + private string TranslateTab(string tabName) + { + + if (!tabName.StartsWith("#")) + return tabName; + + return tabName.Substring(1); + + /* + * The below currently doesnt work on my machine, since the dictonary always creates an entry with lang id = 0, but I dont have a lang id zero + * so the query always fails, which is odd + * + var local = ApplicationContext.Current.Services.LocalizationService; + var dic = local.GetDictionaryItemByKey(tabName); + if (dic == null || !dic.Translations.Any()) + return tabName; + + var lang = local.GetLanguageByCultureCode(UmbracoContext.Current.Security.CurrentUser.Language); + if (lang == null) + return tabName; + + + var translation = dic.Translations.Where(x => x.Language == lang).FirstOrDefault(); + if (translation == null) + return tabName; + + return translation.Value;*/ + } } } diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs new file mode 100644 index 0000000000..565928435a --- /dev/null +++ b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs @@ -0,0 +1,29 @@ +using Umbraco.Core; +using Umbraco.Core.PropertyEditors; + +namespace Umbraco.Web.PropertyEditors +{ + [PropertyEditor(Constants.PropertyEditors.EmailAddressAlias, "Email address", "email")] + public class EmailAddressPropertyEditor : PropertyEditor + { + protected override PropertyValueEditor CreateValueEditor() + { + var editor = base.CreateValueEditor(); + //add an email address validator + editor.Validators.Add(new EmailValidator()); + return editor; + } + + protected override PreValueEditor CreatePreValueEditor() + { + return new EmailAddressePreValueEditor(); + } + + internal class EmailAddressePreValueEditor : PreValueEditor + { + [PreValueField("Required?", "boolean")] + public bool IsRequired { get; set; } + } + + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs index 74e47c749c..04a52041cc 100644 --- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs @@ -8,7 +8,7 @@ using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { - [PropertyEditor(Constants.PropertyEditors.ListViewAlias, "List view", "listview")] + [PropertyEditor(Constants.PropertyEditors.ListViewAlias, "List view", "listview", HideLabel = true)] public class ListViewPropertyEditor : PropertyEditor { diff --git a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs new file mode 100644 index 0000000000..d1102ec2f9 --- /dev/null +++ b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Umbraco.Core; +using Umbraco.Core.PropertyEditors; + +namespace Umbraco.Web.PropertyEditors +{ + [PropertyEditor(Constants.PropertyEditors.MemberPickerAlias, "Member Picker", "memberpicker")] + public class MemberPickerPropertyEditor : PropertyEditor + { + } +} diff --git a/src/Umbraco.Web/PropertyEditors/PropertyValueEditorWrapper.cs b/src/Umbraco.Web/PropertyEditors/PropertyValueEditorWrapper.cs index bb0a1dd903..3f55eb1c99 100644 --- a/src/Umbraco.Web/PropertyEditors/PropertyValueEditorWrapper.cs +++ b/src/Umbraco.Web/PropertyEditors/PropertyValueEditorWrapper.cs @@ -10,6 +10,7 @@ namespace Umbraco.Web.PropertyEditors { public PropertyValueEditorWrapper(PropertyValueEditor wrapped) { + this.HideLabel = wrapped.HideLabel; this.View = wrapped.View; this.ValueType = wrapped.ValueType; foreach (var v in wrapped.Validators) diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs index 274e35d202..405bb70bda 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs @@ -5,7 +5,7 @@ using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { - [PropertyEditor(Constants.PropertyEditors.TinyMCEv3Alias, "Rich Text Editor", "rte")] + [PropertyEditor(Constants.PropertyEditors.TinyMCEv3Alias, "Rich Text Editor", "rte", HideLabel = false)] public class RichTextPropertyEditor : PropertyEditor { /// diff --git a/src/Umbraco.Web/PropertyEditors/UltraSimplePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UltraSimplePropertyEditor.cs new file mode 100644 index 0000000000..6c4b65c98c --- /dev/null +++ b/src/Umbraco.Web/PropertyEditors/UltraSimplePropertyEditor.cs @@ -0,0 +1,10 @@ +using Umbraco.Core; +using Umbraco.Core.PropertyEditors; + +namespace Umbraco.Web.PropertyEditors +{ + [PropertyEditor(Constants.PropertyEditors.UltraSimpleEditorAlias, "Ultrasimple editor", "ultrasimple")] + public class UltraSimplePropertyEditor : PropertyEditor + { + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs index b02ed4ecf2..811fc6be52 100644 --- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Specialized; +using System.ComponentModel.DataAnnotations; using System.Configuration.Provider; +using System.Linq; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; @@ -8,6 +10,7 @@ using System.Web.Hosting; using System.Web.Security; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core.Models.Membership; @@ -254,8 +257,9 @@ namespace Umbraco.Web.Security.Providers } /// - /// Adds a new membership user to the data source. + /// Adds a new membership user to the data source with the specified member type /// + /// A specific member type to create the member for /// The user name for the new user. /// The password for the new user. /// The e-mail address for the new user. @@ -267,16 +271,16 @@ namespace Umbraco.Web.Security.Providers /// /// A object populated with the information for the newly created user. /// - public override MembershipUser CreateUser(string username, string password, string email, string passwordQuestion, string passwordAnswer, + public MembershipUser CreateUser(string memberType, string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) { - LogHelper.Debug("Member signup requested: username -> " + username + ". email -> " +email); + LogHelper.Debug("Member signup requested: username -> " + username + ". email -> " + email); // Validate password if (IsPasswordValid(password) == false) { - status = MembershipCreateStatus.InvalidPassword; - return null; + status = MembershipCreateStatus.InvalidPassword; + return null; } // Validate email @@ -324,18 +328,41 @@ namespace Umbraco.Web.Security.Providers return null; } - var member = MemberService.CreateMember(email, username, password, DefaultMemberTypeAlias); + var member = MemberService.CreateMember(email, username, password, memberType); member.IsApproved = isApproved; member.PasswordQuestion = passwordQuestion; member.PasswordAnswer = passwordAnswer; - + + //encrypts/hashes the password depending on the settings + member.Password = EncryptOrHashPassword(member.Password); + MemberService.Save(member); - + status = MembershipCreateStatus.Success; return member.AsConcreteMembershipUser(); } + /// + /// Adds a new membership user to the data source. + /// + /// The user name for the new user. + /// The password for the new user. + /// The e-mail address for the new user. + /// The password question for the new user. + /// The password answer for the new user + /// Whether or not the new user is approved to be validated. + /// The unique identifier from the membership data source for the user. + /// A enumeration value indicating whether the user was created successfully. + /// + /// A object populated with the information for the newly created user. + /// + public override MembershipUser CreateUser(string username, string password, string email, string passwordQuestion, string passwordAnswer, + bool isApproved, object providerUserKey, out MembershipCreateStatus status) + { + return CreateUser(DefaultMemberTypeAlias, username, password, email, passwordQuestion, passwordAnswer, isApproved, providerUserKey, out status); + } + /// /// Processes a request to update the password question and answer for a membership user. /// @@ -360,7 +387,7 @@ namespace Umbraco.Web.Security.Providers } var member = MemberService.GetByUsername(username); - var encodedPassword = EncodePassword(password); + var encodedPassword = EncryptOrHashPassword(password); if (member.Password == encodedPassword) { @@ -427,12 +454,12 @@ namespace Umbraco.Web.Security.Providers var member = MemberService.GetByUsername(username); if (member == null) return false; - var encodedPassword = EncodePassword(oldPassword); + var encodedPassword = EncryptOrHashPassword(oldPassword); if (member.Password == encodedPassword) { - member.Password = EncodePassword(newPassword); + member.Password = EncryptOrHashPassword(newPassword); MemberService.Save(member); return true; @@ -464,7 +491,7 @@ namespace Umbraco.Web.Security.Providers if (_requiresQuestionAndAnswer == false || (_requiresQuestionAndAnswer && answer == member.PasswordAnswer)) { member.Password = - EncodePassword(Membership.GeneratePassword(_minRequiredPasswordLength, + EncryptOrHashPassword(Membership.GeneratePassword(_minRequiredPasswordLength, _minRequiredNonAlphanumericCharacters)); MemberService.Save(member); } @@ -505,7 +532,7 @@ namespace Umbraco.Web.Security.Providers if (member.IsLockedOut) throw new ProviderException("The member is locked out."); - var encodedPassword = EncodePassword(password); + var encodedPassword = EncryptOrHashPassword(password); var authenticated = (encodedPassword == member.Password); @@ -687,7 +714,16 @@ namespace Umbraco.Web.Security.Providers /// public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords) { - throw new System.NotImplementedException(); + var byEmail = MemberService.FindMembersByEmail(emailToMatch).ToArray(); + totalRecords = byEmail.Length; + var pagedResult = new PagedResult(totalRecords, pageIndex, pageSize); + + var collection = new MembershipUserCollection(); + foreach (var m in byEmail.Skip(pagedResult.SkipSize).Take(pageSize)) + { + collection.Add(m.AsConcreteMembershipUser()); + } + return collection; } #region Private methods @@ -714,11 +750,9 @@ namespace Umbraco.Web.Security.Providers private bool IsEmaiValid(string email) { - const string pattern = @"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|" - + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(? @@ -726,7 +760,7 @@ namespace Umbraco.Web.Security.Providers /// /// The password. /// The encoded password. - private string EncodePassword(string password) + private string EncryptOrHashPassword(string password) { var encodedPassword = password; switch (PasswordFormat) diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs index de013c79c6..4462bfb5fe 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs @@ -13,6 +13,8 @@ using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; using Constants = Umbraco.Core.Constants; +using umbraco; + namespace Umbraco.Web.Trees { @@ -37,7 +39,7 @@ namespace Umbraco.Web.Trees /// /// [HttpQueryStringFilter("queryStrings")] - public SectionRootNode GetApplicationTrees(string application, FormDataCollection queryStrings) + public SectionRootNode GetApplicationTrees(string application, string tree, FormDataCollection queryStrings) { if (application == null) throw new ArgumentNullException("application"); @@ -45,24 +47,40 @@ namespace Umbraco.Web.Trees //find all tree definitions that have the current application alias var appTrees = ApplicationContext.Current.Services.ApplicationTreeService.GetApplicationTrees(application, true).ToArray(); - if (appTrees.Count() == 1) + + if (appTrees.Count() == 1 || !string.IsNullOrEmpty(tree) ) { - return GetRootForSingleAppTree( - appTrees.Single(), + ApplicationTree apptree; + + if (!string.IsNullOrEmpty(tree)) + apptree = appTrees.Where(x => x.Alias == tree).Single(); + else + apptree = appTrees.Single(); + + + var result = GetRootForSingleAppTree( + apptree, Constants.System.Root.ToString(CultureInfo.InvariantCulture), queryStrings, application); + + //PP: should this be further down in the logic? + result.Title = ui.Text("sections", application); + return result; } + var collection = new TreeNodeCollection(); - foreach (var tree in appTrees) + foreach (var apptree in appTrees) { //return the root nodes for each tree in the app - var rootNode = GetRootForMultipleAppTree(tree, queryStrings); + var rootNode = GetRootForMultipleAppTree(apptree, queryStrings); collection.Add(rootNode); } - return SectionRootNode.CreateMultiTreeSectionRoot(rootId, collection); + var multiTree = SectionRootNode.CreateMultiTreeSectionRoot(rootId, collection); + multiTree.Title = ui.Text("sections", application); + return multiTree; } /// diff --git a/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs b/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs index 6666936c70..cd12d20668 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Linq; using Umbraco.Core; +using Umbraco.Core.Models; using umbraco.businesslogic; namespace Umbraco.Web.Trees @@ -25,69 +26,38 @@ namespace Umbraco.Web.Trees /// private static void ScanTrees(ApplicationContext applicationContext) { - applicationContext.Services.ApplicationTreeService.LoadXml(doc => - { - var added = new List(); + var added = new List(); - // Load all Controller Trees by attribute and add them to the XML config - // we also need to make sure that any alias added with the new trees is not also added - // with the legacy trees. - var types = PluginManager.Current.ResolveAttributedTreeControllers(); + // Load all Controller Trees by attribute and add them to the XML config + // we also need to make sure that any alias added with the new trees is not also added + // with the legacy trees. + var types = PluginManager.Current.ResolveAttributedTreeControllers(); - var items = types - .Select(x => - new Tuple(x, x.GetCustomAttributes(false).Single())) - .Where(x => applicationContext.Services.ApplicationTreeService.GetByAlias(x.Item2.Alias) == null); + //get all non-legacy application tree's + var items = types + .Select(x => + new Tuple(x, x.GetCustomAttributes(false).Single())) + .Where(x => applicationContext.Services.ApplicationTreeService.GetByAlias(x.Item2.Alias) == null) + .Select(x => new ApplicationTree(x.Item2.Initialize, x.Item2.SortOrder, x.Item2.ApplicationAlias, x.Item2.Alias, x.Item2.Title, x.Item2.IconClosed, x.Item2.IconOpen, x.Item1.GetFullNameWithAssembly())) + .ToArray(); + + added.AddRange(items.Select(x => x.Alias)); - foreach (var tuple in items) - { - var type = tuple.Item1; - var attr = tuple.Item2; + //find the legacy trees + var legacyTreeTypes = PluginManager.Current.ResolveAttributedTrees(); - //Add the new tree that doesn't exist in the config that was found by type finding + var legacyItems = legacyTreeTypes + .Select(x => + new Tuple( + x, + x.GetCustomAttributes(false).Single())) + .Where(x => applicationContext.Services.ApplicationTreeService.GetByAlias(x.Item2.Alias) == null + //make sure the legacy tree isn't added on top of the controller tree! + && added.InvariantContains(x.Item2.Alias) == false) + .Select(x => new ApplicationTree(x.Item2.Initialize, x.Item2.SortOrder, x.Item2.ApplicationAlias, x.Item2.Alias, x.Item2.Title, x.Item2.IconClosed, x.Item2.IconOpen, x.Item1.GetFullNameWithAssembly())); - doc.Root.Add(new XElement("add", - new XAttribute("initialize", attr.Initialize), - new XAttribute("sortOrder", attr.SortOrder), - new XAttribute("alias", attr.Alias), - new XAttribute("application", attr.ApplicationAlias), - new XAttribute("title", attr.Title), - new XAttribute("iconClosed", attr.IconClosed), - new XAttribute("iconOpen", attr.IconOpen), - new XAttribute("type", type.GetFullNameWithAssembly()))); + applicationContext.Services.ApplicationTreeService.Intitialize(items.Concat(legacyItems)); - added.Add(attr.Alias); - } - - - // Load all LEGACY Trees by attribute and add them to the XML config - var legacyTreeTypes = PluginManager.Current.ResolveAttributedTrees(); - - var legacyItems = legacyTreeTypes - .Select(x => - new Tuple(x, x.GetCustomAttributes(false).Single())) - .Where(x => applicationContext.Services.ApplicationTreeService.GetByAlias(x.Item2.Alias) == null - //make sure the legacy tree isn't added on top of the controller tree! - && !added.InvariantContains(x.Item2.Alias)); - - foreach (var tuple in legacyItems) - { - var type = tuple.Item1; - var attr = tuple.Item2; - - //Add the new tree that doesn't exist in the config that was found by type finding - doc.Root.Add(new XElement("add", - new XAttribute("initialize", attr.Initialize), - new XAttribute("sortOrder", attr.SortOrder), - new XAttribute("alias", attr.Alias), - new XAttribute("application", attr.ApplicationAlias), - new XAttribute("title", attr.Title), - new XAttribute("iconClosed", attr.IconClosed), - new XAttribute("iconOpen", attr.IconOpen), - new XAttribute("type", type.GetFullNameWithAssembly()))); - } - - }, true); } } } diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index 57e4039251..be80bba0b2 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Trees if (RecycleBinId.ToInvariantString() == id) { var menu = new MenuItemCollection(); - menu.Items.Add(ui.Text("actions", ActionEmptyTranscan.Instance.Alias)); + menu.Items.Add(ui.Text("actions", "emptyTrashcan")); menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); return menu; } diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index 161d9d1abc..8f37574d9e 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -66,7 +66,7 @@ namespace Umbraco.Web.Trees var treeDef = new TreeDefinition( legacyAtt.BaseTreeType, - new ApplicationTree(false, true, appTree.SortOrder, appTree.ApplicationAlias, appTree.Alias, appTree.Title, appTree.IconClosed, appTree.IconOpened, "", legacyAtt.BaseTreeType.GetFullNameWithAssembly(), ""), + new ApplicationTree(false, true, (byte)appTree.SortOrder, appTree.ApplicationAlias, appTree.Alias, appTree.Title, appTree.IconClosed, appTree.IconOpened, "", legacyAtt.BaseTreeType.GetFullNameWithAssembly(), ""), new Application(appTree.Alias, appTree.Alias, "", 0)); tree = treeDef.CreateInstance(); @@ -93,7 +93,7 @@ namespace Umbraco.Web.Trees /// /// /// - internal static BaseTree GetLegacyTreeForLegacyServices(ApplicationTreeService appTreeService, string treeType) + internal static BaseTree GetLegacyTreeForLegacyServices(IApplicationTreeService appTreeService, string treeType) { if (appTreeService == null) throw new ArgumentNullException("appTreeService"); if (treeType == null) throw new ArgumentNullException("treeType"); diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index 58aba7d3eb..d5de173200 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -30,12 +30,16 @@ namespace Umbraco.Web.Trees for (var i = 97; i < 123; i++) { var charString = ((char) i).ToString(CultureInfo.InvariantCulture); - nodes.Add(CreateTreeNode(charString, queryStrings, charString, "icon-folder-close", true)); + var folder = CreateTreeNode(charString, queryStrings, charString, "icon-folder-close", true); + folder.NodeType = "member-folder"; + nodes.Add(folder); } //list out 'Others' if the membership provider is umbraco if (Member.InUmbracoMemberMode()) { - nodes.Add(CreateTreeNode("others", queryStrings, "Others", "icon-folder-close", true)); + var folder = CreateTreeNode("others", queryStrings, "Others", "icon-folder-close", true); + folder.NodeType = "member-folder"; + nodes.Add(folder); } } else diff --git a/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs b/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs index d7b486c46f..0f197a076e 100644 --- a/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs +++ b/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.UI.JavaScript JArray merged = new JArray(); foreach (var m in _parser.GetManifests()) { - ManifestParser.MergeJArrays(merged, m.StyleSheetInitialize); + ManifestParser.MergeJArrays(merged, m.StylesheetInitialize); } return ParseMain(merged); diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index 42ed1c270e..f27e6cd876 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -1,5 +1,5 @@ [ - 'lib/jquery/jquery-2.0.3.min.js', + /* the jquery ui elements we need */ /* NOTE: I've opted not to use the full lib, just the parts we need to save on DL */ @@ -12,7 +12,6 @@ 'lib/jquery/jquery.ui.effect-highlight.min.js',*/ /* 1.1.5 */ - 'lib/angular/1.1.5/angular.min.js', 'lib/angular/1.1.5/angular-cookies.min.js', 'lib/angular/1.1.5/angular-mobile.min.js', 'lib/angular/1.1.5/angular-sanitize.min.js', @@ -38,7 +37,6 @@ 'lib/jquery/jquery.upload/js/jquery.fileupload-angular.js', 'lib/bootstrap/js/bootstrap.js', - 'lib/underscore/underscore.js', 'lib/umbraco/Extensions.js', 'lib/umbraco/NamespaceManager.js', diff --git a/src/Umbraco.Web/UI/JavaScript/Main.js b/src/Umbraco.Web/UI/JavaScript/Main.js index 98aa9b88b7..c346fedb51 100644 --- a/src/Umbraco.Web/UI/JavaScript/Main.js +++ b/src/Umbraco.Web/UI/JavaScript/Main.js @@ -1,15 +1,21 @@ yepnope({ - - load: "##JsInitialize##", - + load: [ + 'lib/jquery/jquery-2.0.3.min.js', + 'lib/angular/1.1.5/angular.min.js', + 'lib/underscore/underscore.js', + ], complete: function () { - - //we need to set the legacy UmbClientMgr path - UmbClientMgr.setUmbracoPath('"##UmbracoPath##"'); + yepnope({ + load: "##JsInitialize##", + complete: function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['umbraco']); + //we need to set the legacy UmbClientMgr path + UmbClientMgr.setUmbracoPath('"##UmbracoPath##"'); + + jQuery(document).ready(function () { + angular.bootstrap(document, ['umbraco']); + }); + } }); - } }); \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 0a4af6b636..dfb443dbda 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -309,7 +309,9 @@ + + @@ -327,7 +329,9 @@ + + @@ -351,7 +355,6 @@ - @@ -367,6 +370,7 @@ + @@ -387,6 +391,13 @@ ASPXCodeBehind + + ASPXCodeBehind + + + ASPXCodeBehind + + @@ -1013,13 +1024,6 @@ - - DLRScripting.ascx - ASPXCodeBehind - - - DLRScripting.ascx - @@ -1184,13 +1188,6 @@ Code - - xslt.ascx - ASPXCodeBehind - - - xslt.ascx - LatestEdits.ascx ASPXCodeBehind @@ -1593,7 +1590,6 @@ - @@ -1800,12 +1796,7 @@ ASPXCodeBehind - - ASPXCodeBehind - - - ASPXCodeBehind - + ASPXCodeBehind @@ -1929,18 +1920,9 @@ ASPXCodeBehind - - ASPXCodeBehind - - - ASPXCodeBehind - - - ASPXCodeBehind - - - ASPXCodeBehind - + + + ASPXCodeBehind @@ -2086,4 +2068,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs b/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs index 0051bf94d8..44499fd6b2 100644 --- a/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs +++ b/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs @@ -25,7 +25,8 @@ namespace Umbraco.Web.WebApi.Binders protected override IMember GetExisting(MemberSave model) { - //TODO: We're going to remove the built-in member properties from this editor - not sure if we should be persisting them elsewhere ? + //TODO: We're going to remove the built-in member properties from this editor - We didn't support these in 6.x so + // pretty hard to support them in 7 when the member type editor is using the old APIs! var toRemove = Constants.Conventions.Member.StandardPropertyTypeStubs.Select(x => x.Value.Alias).ToArray(); var member = ApplicationContext.Services.MemberService.GetByUsername(model.Username); @@ -38,12 +39,22 @@ namespace Umbraco.Web.WebApi.Binders protected override IMember CreateNew(MemberSave model) { - var contentType = ApplicationContext.Services.ContentTypeService.GetMemberType(model.ContentTypeAlias); + var contentType = ApplicationContext.Services.MemberTypeService.GetMemberType(model.ContentTypeAlias); if (contentType == null) { throw new InvalidOperationException("No member type found wth alias " + model.ContentTypeAlias); } - return new Member(model.Name, model.Email, model.Username, model.Password, -1, contentType); + + //TODO: We're going to remove the built-in member properties from this editor - We didn't support these in 6.x so + // pretty hard to support them in 7 when the member type editor is using the old APIs! + var toRemove = Constants.Conventions.Member.StandardPropertyTypeStubs.Select(x => x.Value.Alias).ToArray(); + foreach (var remove in toRemove) + { + contentType.RemovePropertyType(remove); + } + + //return the new member with the details filled in + return new Member(model.Name, model.Email, model.Username, model.Password.NewPassword, -1, contentType); } protected override ContentItemDto MapFromPersisted(MemberSave model) diff --git a/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs b/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs index a68eb2cbbf..7875bfb076 100644 --- a/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs +++ b/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs @@ -139,7 +139,7 @@ namespace Umbraco.Web.WebApi.Filters foreach (var result in editor.ValueEditor.Validators.SelectMany(v => v.Validate(postedValue, preValues, editor))) { - AddError(actionContext.ModelState, result, p.Alias); + actionContext.ModelState.AddPropertyError(result, p.Alias); } //Now we need to validate the property based on the PropertyType validation (i.e. regex and required) @@ -148,7 +148,7 @@ namespace Umbraco.Web.WebApi.Filters { foreach (var result in p.PropertyEditor.ValueEditor.RequiredValidator.Validate(postedValue, "", preValues, editor)) { - AddError(actionContext.ModelState, result, p.Alias); + actionContext.ModelState.AddPropertyError(result, p.Alias); } } @@ -156,7 +156,7 @@ namespace Umbraco.Web.WebApi.Filters { foreach (var result in p.PropertyEditor.ValueEditor.RegexValidator.Validate(postedValue, p.ValidationRegExp, preValues, editor)) { - AddError(actionContext.ModelState, result, p.Alias); + actionContext.ModelState.AddPropertyError(result, p.Alias); } } } @@ -164,30 +164,6 @@ namespace Umbraco.Web.WebApi.Filters return actionContext.ModelState.IsValid; } - /// - /// Adds the error to model state correctly for a property so we can use it on the client side. - /// - /// - /// - /// - private void AddError(ModelStateDictionary modelState, ValidationResult result, string propertyAlias) - { - //if there are no member names supplied then we assume that the validation message is for the overall property - // not a sub field on the property editor - if (!result.MemberNames.Any()) - { - //add a model state error for the entire property - modelState.AddModelError(string.Format("{0}.{1}", "Properties", propertyAlias), result.ErrorMessage); - } - else - { - //there's assigned field names so we'll combine the field name with the property name - // so that we can try to match it up to a real sub field of this editor - foreach (var field in result.MemberNames) - { - modelState.AddModelError(string.Format("{0}.{1}.{2}", "Properties", propertyAlias, field), result.ErrorMessage); - } - } - } + } } \ No newline at end of file diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs index a968deef2e..3fe408fa12 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs @@ -30,7 +30,7 @@ namespace Umbraco.Web.WebApi.Filters { private readonly int? _nodeId; private readonly string _paramName; - private readonly char _permissionToCheck; + private readonly char? _permissionToCheck; /// /// This constructor will only be able to test the start node access diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs index 33f522ba44..e9a9fd5bf0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs @@ -75,8 +75,7 @@ namespace umbraco xNode.NodeID = di.id.ToString(); //dictionary_ + id.. xNode.Text = di.key; xNode.Action = string.Format("javascript:openDictionaryItem({0});", di.id); - xNode.Icon = "settingDataType.gif"; - xNode.OpenIcon = "settingDataType.gif"; + xNode.Icon = "icon-book-alt"; xNode.NodeType = "DictionaryItem"; //this shouldn't be like this, it should be this.TreeAlias but the ui.config file points to this name. xNode.Source = this.GetTreeServiceUrl(di.id); xNode.HasChildren = di.hasChildren; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index 4935886e9a..19d303cbc2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -23,6 +23,7 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using Umbraco.Core; +using umbraco.cms.presentation.Trees; namespace umbraco { @@ -30,9 +31,14 @@ namespace umbraco /// Handles loading of the packager application into the developer application tree /// [Tree(Constants.Applications.Developer, "packager", "Packages", sortOrder: 3)] - public class loadPackager : ITree + public class loadPackager : BaseTree { #region TreeI Members + public loadPackager(string application) : base(application) { } + protected override void CreateRootNode(ref XmlTreeNode rootNode) + { + + } private int _id; private string _app; @@ -59,7 +65,7 @@ namespace umbraco /// Renders the Javascript. /// /// The javascript. - public void RenderJS(ref StringBuilder Javascript) + public override void RenderJS(ref StringBuilder Javascript) { Javascript.Append( @"function openPackageCategory(url) { @@ -71,37 +77,37 @@ namespace umbraco /// Renders the specified tree item. /// /// The tree. - public void Render(ref XmlDocument Tree) + public override void Render(ref XmlTree tree) { - XmlElement root = Tree.DocumentElement; + string[,] items = { { "BrowseRepository.aspx", "Install from repository" }, { "CreatePackage.aspx", "Createdjjj Packages" }, { "installedPackages.aspx", "Installedjj packages" }, { "StarterKits.aspx", "Starter kit" }, { "installer.aspx", "Install local package" } }; for (int i = 0; i <= items.GetUpperBound(0); i++) { - - XmlElement treeElement = Tree.CreateElement("tree"); - treeElement.SetAttribute("nodeID", "-1"); - treeElement.SetAttribute("text", items[i, 1]); - treeElement.SetAttribute("icon", "icon-folder"); - treeElement.SetAttribute("openIcon", "folder_o.gif"); - + XmlTreeNode xNode = XmlTreeNode.Create(this); + xNode.NodeID = "-1"; + xNode.Text = items[i, 1]; + xNode.Icon = "icon-folder"; + xNode.OpenIcon = "icon-folder"; + + //Make sure the different sections load the correct childnodes. switch (items[i, 0]) { case "installedPackages.aspx": if (cms.businesslogic.packager.InstalledPackage.GetAllInstalledPackages().Count > 0) { - treeElement.SetAttribute("src", "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=installed" + "&rnd=" + Guid.NewGuid()); - treeElement.SetAttribute("nodeType", "installedPackages"); - treeElement.SetAttribute("menu", "L"); - treeElement.SetAttribute("text", ui.Text("treeHeaders", "installedPackages")); - treeElement.SetAttribute("hasChildren", "true"); + xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=installed" + "&rnd=" + Guid.NewGuid(); + xNode.NodeType = "installedPackages"; + xNode.Menu.Add(umbraco.BusinessLogic.Actions.ActionRefresh.Instance); + xNode.Text = ui.Text("treeHeaders", "installedPackages"); + xNode.HasChildren = true; } else { - treeElement.SetAttribute("text", ""); + xNode.Text = ""; } break; @@ -116,63 +122,59 @@ namespace umbraco // the repositories will then be fetched from the loadPackages class. if (repos.Count > 1) { - treeElement.SetAttribute("src", "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repositories" + "&rnd=" + Guid.NewGuid()); - treeElement.SetAttribute("nodeType", "packagesRepositories"); - treeElement.SetAttribute("menu", "L"); - treeElement.SetAttribute("text", ui.Text("treeHeaders", "repositories")); - treeElement.SetAttribute("hasChildren", "true"); + xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repositories" + "&rnd=" + Guid.NewGuid(); + xNode.NodeType = "packagesRepositories"; + xNode.Menu.Add(umbraco.BusinessLogic.Actions.ActionRefresh.Instance); + xNode.Text = ui.Text("treeHeaders", "repositories"); + xNode.HasChildren = true; } //if only one repo, then just list it directly and name it as the repository. //the packages will be loaded from the loadPackages class with a repoAlias querystring else if (repos.Count == 1) { - treeElement.SetAttribute("text", repos[0].Name); - treeElement.SetAttribute("src", "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repos[0].Guid + "&rnd=" + Guid.NewGuid()); - treeElement.SetAttribute("nodeType", "packagesRepository"); - treeElement.SetAttribute("menu", "L"); - treeElement.SetAttribute("action", "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repos[0].Guid + "');"); - treeElement.SetAttribute("icon", "icon-server-alt"); - treeElement.SetAttribute("openIcon", "icon-server-alt"); - treeElement.SetAttribute("hasChildren", "true"); + xNode.Text = repos[0].Name; + xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repos[0].Guid + "&rnd=" + Guid.NewGuid(); + xNode.NodeType = "packagesRepository"; + xNode.Menu.Add(umbraco.BusinessLogic.Actions.ActionRefresh.Instance); + xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repos[0].Guid + "');"; + xNode.Icon = "icon-server-alt"; + xNode.HasChildren = true; } //if none registered, then remove the repo node. else if (repos.Count == 0) { - treeElement.SetAttribute("text", ""); + xNode.Text = ""; } break; case "CreatePackage.aspx": - treeElement.SetAttribute("src", "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=created" + "&rnd=" + Guid.NewGuid()); - treeElement.SetAttribute("nodeType", "createdPackages"); - treeElement.SetAttribute("menu", "C,L"); - treeElement.SetAttribute("text", ui.Text("treeHeaders", "createdPackages")); - treeElement.SetAttribute("hasChildren", "true"); + xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=created" + "&rnd=" + Guid.NewGuid(); + xNode.NodeType = "createdPackages"; + xNode.Menu.Add(umbraco.BusinessLogic.Actions.ActionNew.Instance); + xNode.Menu.Add(umbraco.BusinessLogic.Actions.ActionRefresh.Instance); + xNode.Text = ui.Text("treeHeaders", "createdPackages"); + xNode.HasChildren = true; break; case "installer.aspx": - treeElement.SetAttribute("src", ""); - treeElement.SetAttribute("nodeType", "uploadPackage"); + xNode.Source = ""; + xNode.NodeType = "uploadPackage"; //treeElement.SetAttribute("menu", ""); - treeElement.SetAttribute("icon", "icon-page-up"); - treeElement.SetAttribute("openIcon", "icon-page-up"); - treeElement.SetAttribute("action", "javascript:openPackageCategory('" + items[i, 0] + "');"); - treeElement.SetAttribute("text", ui.Text("treeHeaders", "localPackage")); + xNode.Icon = "icon-page-up"; + xNode.Action = "javascript:openPackageCategory('" + items[i, 0] + "');"; + xNode.Text = ui.Text("treeHeaders", "localPackage"); break; case "StarterKits.aspx": - treeElement.SetAttribute("src", ""); - treeElement.SetAttribute("nodeType", "starterKits"); - //treeElement.SetAttribute("menu", "L"); - treeElement.SetAttribute("action", "javascript:openPackageCategory('" + items[i, 0] + "');"); - treeElement.SetAttribute("icon", "icon-flash"); - treeElement.SetAttribute("openIcon", "icon-flash"); - - treeElement.SetAttribute("text", ui.Text("treeHeaders", "installStarterKit")); + xNode.Source = ""; + xNode.NodeType = "starterKits"; + xNode.Action = "javascript:openPackageCategory('" + items[i, 0] + "');"; + xNode.Icon = "icon-flash"; + xNode.Text = ui.Text("treeHeaders", "installStarterKit"); break; @@ -180,9 +182,8 @@ namespace umbraco break; } - if (treeElement.GetAttribute("text") != "") - root.AppendChild(treeElement); - + if (xNode.Text != "") + tree.Add(xNode); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx deleted file mode 100644 index 0ebac9bc3c..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx +++ /dev/null @@ -1,37 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DLRScripting.ascx.cs" Inherits="umbraco.presentation.create.DLRScripting" %> -<%@ Import Namespace="umbraco" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - * - - - - - - - - - - - - - - - - - - - - - - <%=umbraco.ui.Text("cancel")%> - - - - -