The database you're trying to use does not support case insensitive queries.
We currently do not support these types of databases.
" +
- "You can fix this by changing the following setting in your my.ini file in your MySQL installation directory:
" +
- "Note: Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
- "("Database upgrade started");
- var message = GetResultMessageForMySql();
+ var message = _scopeProvider.SqlContext.DatabaseType.IsMySql() ? ResultMessageForMySql : "";
// upgrade
var upgrader = new UmbracoUpgrader();
@@ -554,47 +561,14 @@ namespace Umbraco.Core.Migrations.Install
}
}
- private string GetResultMessageForMySql()
- {
- if (_databaseFactory.GetType() == typeof(MySqlSyntaxProvider))
- {
- return "
Congratulations, the database step ran successfully!
" +
- "Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.
" +
- "However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries
" +
- "Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
- "They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:
" +
- "lower_case_table_names=1
" +
- "For more technical information on case sensitivity in MySQL, have a look at " +
- "the documentation on the subject
";
- }
- return string.Empty;
- }
-
- /*
- private string GetResultMessageForMySql(bool? supportsCaseInsensitiveQueries)
- {
- if (supportsCaseInsensitiveQueries == null)
- {
- return "
Warning! Could not check if your database type supports case insensitive queries.
We currently do not support these databases that do not support case insensitive queries.
" +
- "You can check this by looking for the following setting in your my.ini file in your MySQL installation directory:
" +
- "lower_case_table_names=1
" +
- "Note: Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
- "For more technical information on case sensitivity in MySQL, have a look at " +
- "the documentation on the subject
";
- }
- if (SqlSyntax.GetType() == typeof(MySqlSyntaxProvider))
- {
- return "
Congratulations, the database step ran successfully!
" +
- "Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.
" +
- "However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries
" +
- "Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
- "They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:
" +
- "lower_case_table_names=1
" +
- "For more technical information on case sensitivity in MySQL, have a look at " +
- "the documentation on the subject
";
- }
- return string.Empty;
- }*/
+ private const string ResultMessageForMySql = "
Congratulations, the database step ran successfully!
" +
+ "Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.
" +
+ "However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries
" +
+ "Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
+ "They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:
" +
+ "lower_case_table_names=1
" +
+ "For more technical information on case sensitivity in MySQL, have a look at " +
+ "the documentation on the subject
";
private Attempt CheckReadyForInstall()
{
@@ -630,11 +604,29 @@ namespace Umbraco.Core.Migrations.Install
};
}
- internal class Result
+ ///
+ /// Represents the result of a database creation or upgrade.
+ ///
+ public class Result
{
+ ///
+ /// Gets or sets a value indicating whether an upgrade is required.
+ ///
public bool RequiresUpgrade { get; set; }
+
+ ///
+ /// Gets or sets the message returned by the operation.
+ ///
public string Message { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the operation succeeded.
+ ///
public bool Success { get; set; }
+
+ ///
+ /// Gets or sets an install progress pseudo-percentage.
+ ///
public string Percentage { get; set; }
}
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index 64be8161f2..eba5e61390 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -138,9 +138,8 @@ namespace Umbraco.Core.Migrations.Install
{
var result = new DatabaseSchemaResult(SqlSyntax);
- //get the db index defs
- result.DbIndexDefinitions = SqlSyntax.GetDefinedIndexes(_database)
- .Select(x => new DbIndexDefinition(x)).ToArray();
+ result.IndexDefinitions.AddRange(SqlSyntax.GetDefinedIndexes(_database)
+ .Select(x => new DbIndexDefinition(x)));
result.TableDefinitions.AddRange(OrderedTables
.Select(x => DefinitionFactory.GetTableDefinition(x, SqlSyntax)));
@@ -279,7 +278,7 @@ namespace Umbraco.Core.Migrations.Install
{
//These are just column indexes NOT constraints or Keys
//var colIndexesInDatabase = result.DbIndexDefinitions.Where(x => x.IndexName.InvariantStartsWith("IX_")).Select(x => x.IndexName).ToList();
- var colIndexesInDatabase = result.DbIndexDefinitions.Select(x => x.IndexName).ToList();
+ var colIndexesInDatabase = result.IndexDefinitions.Select(x => x.IndexName).ToList();
var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
//Add valid and invalid index differences to the result object
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
index 0ec27cf0b1..4c68addebc 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
@@ -2,153 +2,55 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using Umbraco.Core.Configuration;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.SqlSyntax;
namespace Umbraco.Core.Migrations.Install
{
- public class DatabaseSchemaResult
+ ///
+ /// Represents ...
+ ///
+ internal class DatabaseSchemaResult
{
- private readonly ISqlSyntaxProvider _sqlSyntax;
+ private readonly bool _isMySql;
public DatabaseSchemaResult(ISqlSyntaxProvider sqlSyntax)
{
- _sqlSyntax = sqlSyntax;
+ _isMySql = sqlSyntax is MySqlSyntaxProvider;
+
Errors = new List>();
TableDefinitions = new List();
ValidTables = new List();
ValidColumns = new List();
ValidConstraints = new List();
ValidIndexes = new List();
+ IndexDefinitions = new List();
}
- public List> Errors { get; set; }
+ public List> Errors { get; }
- public List TableDefinitions { get; set; }
+ public List TableDefinitions { get; }
- public List ValidTables { get; set; }
+ // fixme TableDefinitions are those that should be there, IndexDefinitions are those that... are in DB?
+ internal List IndexDefinitions { get; }
- public List ValidColumns { get; set; }
+ public List ValidTables { get; }
- public List ValidConstraints { get; set; }
+ public List ValidColumns { get; }
- public List ValidIndexes { get; set; }
+ public List ValidConstraints { get; }
- internal IEnumerable DbIndexDefinitions { get; set; }
+ public List ValidIndexes { get; }
///
- /// Determines the version of the currently installed database by detecting the current database structure
+ /// Determines whether the database contains an installed version.
///
- ///
- /// A with Major and Minor values for
- /// non-empty database, otherwise "0.0.0" for empty databases.
- ///
- public Version DetermineInstalledVersion()
+ ///
+ /// A database contains an installed version when it contains at least one valid table.
+ ///
+ public bool DetermineHasInstalledVersion()
{
- // v8 = kill versions older than 7
-
- //If (ValidTables.Count == 0) database is empty and we return -> new Version(0, 0, 0);
- if (ValidTables.Count == 0)
- return new Version(0, 0, 0);
-
- // FIXME - but the whole detection is borked really
- return new Version(8, 0, 0);
-
- //If Errors is empty or if TableDefinitions tables + columns correspond to valid tables + columns then we're at current version
- if (Errors.Any() == false ||
- (TableDefinitions.All(x => ValidTables.Contains(x.Name))
- && TableDefinitions.SelectMany(definition => definition.Columns).All(x => ValidColumns.Contains(x.Name))))
- return UmbracoVersion.Current;
-
- //If Errors contains umbracoApp or umbracoAppTree its pre-6.0.0 -> new Version(4, 10, 0);
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoApp") || x.Item2.InvariantEquals("umbracoAppTree"))))
- {
- //If Errors contains umbracoUser2app or umbracoAppTree foreignkey to umbracoApp exists its pre-4.8.0 -> new Version(4, 7, 0);
- if (Errors.Any(x =>
- x.Item1.Equals("Constraint")
- && (x.Item2.InvariantContains("umbracoUser2app_umbracoApp")
- || x.Item2.InvariantContains("umbracoAppTree_umbracoApp"))))
- {
- return new Version(4, 7, 0);
- }
-
- return new Version(4, 8, 0);
- }
-
- //if the error is for umbracoServer
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoServer"))))
- {
- return new Version(6, 0, 0);
- }
-
- //if the error indicates a problem with the column cmsMacroProperty.macroPropertyType then it is not version 7
- // since these columns get removed in v7
- if (Errors.Any(x => x.Item1.Equals("Column") && (x.Item2.InvariantEquals("cmsMacroProperty,macroPropertyType"))))
- {
- //if the error is for this IX_umbracoNodeTrashed which is added in 6.2 AND in 7.1 but we do not have the above columns
- // then it must mean that we aren't on 6.2 so must be 6.1
- if (Errors.Any(x => x.Item1.Equals("Index") && (x.Item2.InvariantEquals("IX_umbracoNodeTrashed"))))
- {
- return new Version(6, 1, 0);
- }
- else
- {
- //if there are no errors for that index, then the person must have 6.2 installed
- return new Version(6, 2, 0);
- }
- }
-
- //if the error indicates a problem with the constraint FK_cms-OBSOLETE-Content_cmsContentType_nodeId then it is not version 7.2
- // since this gets added in 7.2.0 so it must be the previous version
- if (Errors.Any(x => x.Item1.Equals("Constraint") && (x.Item2.InvariantEquals("FK_cms-OBSOLETE-Content_cmsContentType_nodeId"))))
- {
- return new Version(7, 0, 0);
- }
-
- //if the error is for umbracoAccess it must be the previous version to 7.3 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoAccess"))))
- {
- return new Version(7, 2, 0);
- }
-
- //if the error is for cms-OBSOLETE-PropertyData.dataDecimal it must be the previous version to 7.4 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Column") && (x.Item2.InvariantEquals("cms-OBSOLETE-PropertyData,dataDecimal"))))
- {
- return new Version(7, 3, 0);
- }
-
- //if the error is for umbracoRedirectUrl it must be the previous version to 7.5 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoRedirectUrl"))))
- {
- return new Version(7, 4, 0);
- }
-
- //if the error indicates a problem with the column cmsMacroProperty.uniquePropertyId then it is not version 7.6 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Column") && (x.Item2.InvariantEquals("cmsMacroProperty,uniquePropertyId"))))
- {
- return new Version(7, 5, 0);
- }
-
- //if the error is for umbracoUserGroup it must be the previous version to 7.7 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoUserStartNode"))))
- {
- return new Version(7, 6, 0);
- }
-
- //if the error is for cmsMedia it must be the previous version to 7.8 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoMedia"))))
- {
- return new Version(7, 7, 0);
- }
-
- //if the error is for isSensitive column it must be the previous version to 7.9 since that is when it is added
- if (Errors.Any(x => x.Item1.Equals("Column") && (x.Item2.InvariantEquals("cmsMemberType,isSensitive"))))
- {
- return new Version(7, 8, 0);
- }
-
- return UmbracoVersion.Current;
+ return ValidTables.Count > 0;
}
///
@@ -200,9 +102,9 @@ namespace Umbraco.Core.Migrations.Install
sb.AppendLine(" ");
}
- if (_sqlSyntax is MySqlSyntaxProvider)
+ if (_isMySql)
{
- sb.AppendLine("Please note that the constraints could not be validated because the current dataprovider is MySql.");
+ sb.AppendLine("Please note that the constraints could not be validated because the current data provider is MySql.");
}
return sb.ToString();
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index 5b604eff3f..0c049e81bf 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -151,7 +151,7 @@ namespace Umbraco.Core.Models.PublishedContent
/// is the edited version) or false (document is published, and has not been edited, and
/// what is returned is the published version).
///
- bool IsDraft { get; }
+ bool IsDraft(string culture = null);
// fixme - consider having an IsPublished flag too
// so that when IsDraft is true, we can check whether there is a published version?
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
index 5bdeb3685d..6a69d0b9e1 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
@@ -109,7 +109,7 @@ namespace Umbraco.Core.Models.PublishedContent
public virtual PublishedItemType ItemType => _content.ItemType;
///
- public virtual bool IsDraft => _content.IsDraft;
+ public virtual bool IsDraft(string culture = null) => _content.IsDraft(culture);
#endregion
diff --git a/src/Umbraco.Core/Serialization/CaseInsensitiveDictionaryConverter.cs b/src/Umbraco.Core/Serialization/CaseInsensitiveDictionaryConverter.cs
new file mode 100644
index 0000000000..a92d562a52
--- /dev/null
+++ b/src/Umbraco.Core/Serialization/CaseInsensitiveDictionaryConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Newtonsoft.Json.Converters;
+
+namespace Umbraco.Core.Serialization
+{
+ ///
+ /// Marks dictionaries so they are deserialized as case-insensitive.
+ ///
+ ///
+ /// [JsonConverter(typeof(CaseInsensitiveDictionaryConverter{PropertyData[]}))]
+ /// public Dictionary{string, PropertyData[]} PropertyData {{ get; set; }}
+ ///
+ public class CaseInsensitiveDictionaryConverter : CustomCreationConverter
+ {
+ public override bool CanWrite => false;
+
+ public override bool CanRead => true;
+
+ public override bool CanConvert(Type objectType) => typeof(IDictionary).IsAssignableFrom(objectType);
+
+ public override IDictionary Create(Type objectType) => new Dictionary(StringComparer.OrdinalIgnoreCase);
+ }
+}
diff --git a/src/Umbraco.Core/Services/IUserService.cs b/src/Umbraco.Core/Services/IUserService.cs
index cb2d90aa63..a926ce32aa 100644
--- a/src/Umbraco.Core/Services/IUserService.cs
+++ b/src/Umbraco.Core/Services/IUserService.cs
@@ -90,16 +90,6 @@ namespace Umbraco.Core.Services
string[] userGroups = null,
string filter = null);
- ///
- /// This is simply a helper method which essentially just wraps the MembershipProvider's ChangePassword method
- ///
- ///
- /// This method exists so that Umbraco developers can use one entry point to create/update users if they choose to.
- ///
- /// The user to save the password for
- /// The password to save
- void SavePassword(IUser user, string password);
-
///
/// Deletes or disables a User
///
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 44358caa84..188c6feb04 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -227,30 +227,6 @@ namespace Umbraco.Core.Services.Implement
Save(membershipUser);
}
- [Obsolete("ASP.NET Identity APIs like the BackOfficeUserManager should be used to manage passwords, this will not work with correct security practices because you would need the existing password")]
- [EditorBrowsable(EditorBrowsableState.Never)]
- public void SavePassword(IUser user, string password)
- {
- if (user == null) throw new ArgumentNullException(nameof(user));
-
- var provider = MembershipProviderExtensions.GetUsersMembershipProvider();
-
- if (provider.IsUmbracoMembershipProvider() == false)
- throw new NotSupportedException("When using a non-Umbraco membership provider you must change the user password by using the MembershipProvider.ChangePassword method");
-
- provider.ChangePassword(user.Username, "", password);
-
- //go re-fetch the member and update the properties that may have changed
- var result = GetByUsername(user.Username);
- if (result != null)
- {
- //should never be null but it could have been deleted by another thread.
- user.RawPasswordValue = result.RawPasswordValue;
- user.LastPasswordChangeDate = result.LastPasswordChangeDate;
- user.UpdateDate = result.UpdateDate;
- }
- }
-
///
/// Deletes or disables a User
///
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 8593a715fe..ba0cf97bf7 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1311,6 +1311,7 @@
+
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index ebba8bc1cc..34fb2add8b 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -52,8 +52,7 @@ namespace Umbraco.Tests.Configurations
SystemDirectories.Root = rootPath;
Assert.AreEqual(outcome, UmbracoConfig.For.GlobalSettings().GetUmbracoMvcArea());
}
-
- [TestCase("/umbraco/umbraco.aspx")]
+
[TestCase("/umbraco/editContent.aspx")]
[TestCase("/install/default.aspx")]
[TestCase("/install/")]
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index f1ac463305..962d6d13a9 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
[Test]
public void PreviewBadge()
{
- Assert.AreEqual(SettingsSection.Content.PreviewBadge, @"In Preview Mode - click to end");
+ Assert.AreEqual(SettingsSection.Content.PreviewBadge, @"In Preview Mode - click to end");
}
[Test]
public void ResolveUrlsFromTextString()
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index a436dad9f5..4c64485503 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -77,7 +77,7 @@
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx
deleted file mode 100644
index 6e70513afd..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="umbraco.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.umbraco" %>
-
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs
deleted file mode 100644
index b70378bb01..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Web.UI.Umbraco
-{
- public partial class umbraco : System.Web.UI.Page
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- Response.Status = "301 Moved Permanently";
- Response.AddHeader("Location", UmbracoConfig.For.GlobalSettings().Path);
- }
- }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs
deleted file mode 100644
index c9a577fb34..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 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 {
-
-
- public partial class umbraco {
- }
-}
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 42c8b01e24..df6fe953fe 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -41,7 +41,7 @@
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
In Preview Mode - click to end
+ In Preview Mode - click to end
]]>
diff --git a/src/Umbraco.Web.UI/default.aspx b/src/Umbraco.Web.UI/default.aspx
index 75b0e5d28c..a41d1eccf7 100644
--- a/src/Umbraco.Web.UI/default.aspx
+++ b/src/Umbraco.Web.UI/default.aspx
@@ -1,2 +1,2 @@
-<%@ Page language="c#" Codebehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.UmbracoDefault" trace="true" validateRequest="false" %>
+<%@ Page language="c#" AutoEventWireup="True" Inherits="umbraco.UmbracoDefault" trace="true" validateRequest="false" %>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
index 0a20fa07d3..d51d41e558 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
@@ -14,7 +14,7 @@
Opprett pakke
Slett
Deaktiver
- Tøm papirkurv
+ Tøm papirkurv
Eksporter dokumenttype
Importer dokumenttype
Importer pakke
@@ -218,7 +218,6 @@
Lukk dette vinduet
Er du sikker på at du vil slette
Er du sikker på at du vil deaktivere
- Vennligst kryss av i denne boksen for å bekrefte sletting av %0% element(er)
Er du sikker på at du vil forlate Umbraco?
Er du sikker?
Klipp ut
@@ -961,4 +960,4 @@ Vennlig hilsen Umbraco roboten
Din historikk
Sesjonen utløper om
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
index 2579592cfe..0a87631329 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
@@ -14,7 +14,7 @@
創建擴展包
刪除
禁用
- 清空回收站
+ 清空回收站
匯出文檔類型
導入文檔類型
導入擴展包
@@ -234,7 +234,6 @@
關閉窗口
您確定要刪除嗎
您確定要禁用嗎
- 按一下此框確定刪除%0%項
您確定嗎?
您確定嗎？
剪切
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 6a91d20ae0..6e119d68d9 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -88,5 +88,23 @@ namespace Umbraco.Web.Editors
// if (string.IsNullOrEmpty(editor)) throw new ArgumentNullException(nameof(editor));
// return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + editor.Replace(".html", string.Empty) + ".cshtml");
//}
+
+ public ActionResult End(string redir = null)
+ {
+ var previewToken = Request.GetPreviewCookieValue();
+ var service = Current.PublishedSnapshotService;
+ service.ExitPreview(previewToken);
+
+ System.Web.HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
+
+ if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
+ && redir.StartsWith("//") == false
+ && Uri.TryCreate(redir, UriKind.Relative, out Uri url))
+ {
+ return Redirect(url.ToString());
+ }
+
+ return Redirect("/");
+ }
}
}
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index 0d0438138a..00e124cb29 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -18,26 +18,26 @@ namespace Umbraco.Web.Editors
[JsonCamelCaseFormatter]
public class TemplateQueryController : UmbracoAuthorizedJsonController
{
- private IEnumerable Terms
+ private IEnumerable Terms
{
get
{
- return new List()
+ return new List()
{
- new OperathorTerm(Services.TextService.Localize("template/is"), Operathor.Equals, new [] {"string"}),
- new OperathorTerm(Services.TextService.Localize("template/isNot"), Operathor.NotEquals, new [] {"string"}),
- new OperathorTerm(Services.TextService.Localize("template/before"), Operathor.LessThan, new [] {"datetime"}),
- new OperathorTerm(Services.TextService.Localize("template/beforeIncDate"), Operathor.LessThanEqualTo, new [] {"datetime"}),
- new OperathorTerm(Services.TextService.Localize("template/after"), Operathor.GreaterThan, new [] {"datetime"}),
- new OperathorTerm(Services.TextService.Localize("template/afterIncDate"), Operathor.GreaterThanEqualTo, new [] {"datetime"}),
- new OperathorTerm(Services.TextService.Localize("template/equals"), Operathor.Equals, new [] {"int"}),
- new OperathorTerm(Services.TextService.Localize("template/doesNotEqual"), Operathor.NotEquals, new [] {"int"}),
- new OperathorTerm(Services.TextService.Localize("template/contains"), Operathor.Contains, new [] {"string"}),
- new OperathorTerm(Services.TextService.Localize("template/doesNotContain"), Operathor.NotContains, new [] {"string"}),
- new OperathorTerm(Services.TextService.Localize("template/greaterThan"), Operathor.GreaterThan, new [] {"int"}),
- new OperathorTerm(Services.TextService.Localize("template/greaterThanEqual"), Operathor.GreaterThanEqualTo, new [] {"int"}),
- new OperathorTerm(Services.TextService.Localize("template/lessThan"), Operathor.LessThan, new [] {"int"}),
- new OperathorTerm(Services.TextService.Localize("template/lessThanEqual"), Operathor.LessThanEqualTo, new [] {"int"})
+ new OperatorTerm(Services.TextService.Localize("template/is"), Operator.Equals, new [] {"string"}),
+ new OperatorTerm(Services.TextService.Localize("template/isNot"), Operator.NotEquals, new [] {"string"}),
+ new OperatorTerm(Services.TextService.Localize("template/before"), Operator.LessThan, new [] {"datetime"}),
+ new OperatorTerm(Services.TextService.Localize("template/beforeIncDate"), Operator.LessThanEqualTo, new [] {"datetime"}),
+ new OperatorTerm(Services.TextService.Localize("template/after"), Operator.GreaterThan, new [] {"datetime"}),
+ new OperatorTerm(Services.TextService.Localize("template/afterIncDate"), Operator.GreaterThanEqualTo, new [] {"datetime"}),
+ new OperatorTerm(Services.TextService.Localize("template/equals"), Operator.Equals, new [] {"int"}),
+ new OperatorTerm(Services.TextService.Localize("template/doesNotEqual"), Operator.NotEquals, new [] {"int"}),
+ new OperatorTerm(Services.TextService.Localize("template/contains"), Operator.Contains, new [] {"string"}),
+ new OperatorTerm(Services.TextService.Localize("template/doesNotContain"), Operator.NotContains, new [] {"string"}),
+ new OperatorTerm(Services.TextService.Localize("template/greaterThan"), Operator.GreaterThan, new [] {"int"}),
+ new OperatorTerm(Services.TextService.Localize("template/greaterThanEqual"), Operator.GreaterThanEqualTo, new [] {"int"}),
+ new OperatorTerm(Services.TextService.Localize("template/lessThan"), Operator.LessThan, new [] {"int"}),
+ new OperatorTerm(Services.TextService.Localize("template/lessThanEqual"), Operator.LessThanEqualTo, new [] {"int"})
};
}
}
@@ -67,6 +67,7 @@ namespace Umbraco.Web.Editors
sb.Append("Model.Root()");
+ //fixme: This timer thing is not correct, it's definitely not timing the resulting query, the timer really isn't important and might as well be removed
var timer = new Stopwatch();
timer.Start();
diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
index 387360163a..81b1aac217 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Install.Controllers
public bool PostValidateDatabaseConnection(DatabaseModel model)
{
- var canConnect = _databaseBuilder.CheckConnection(model.DatabaseType.ToString(), model.ConnectionString, model.Server, model.DatabaseName, model.Login, model.Password, model.IntegratedAuth);
+ var canConnect = _databaseBuilder.CanConnect(model.DatabaseType.ToString(), model.ConnectionString, model.Server, model.DatabaseName, model.Login, model.Password, model.IntegratedAuth);
return canConnect;
}
diff --git a/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs b/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
index a54b64733f..2fe6c0ceda 100644
--- a/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
@@ -1,7 +1,6 @@
using System;
using System.Configuration;
using Umbraco.Core;
-using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Web.Install.Models;
@@ -29,7 +28,7 @@ namespace Umbraco.Web.Install.InstallSteps
database = new DatabaseModel();
}
- if (_databaseBuilder.CheckConnection(database.DatabaseType.ToString(), database.ConnectionString, database.Server, database.DatabaseName, database.Login, database.Password, database.IntegratedAuth) == false)
+ if (_databaseBuilder.CanConnect(database.DatabaseType.ToString(), database.ConnectionString, database.Server, database.DatabaseName, database.Login, database.Password, database.IntegratedAuth) == false)
{
throw new InstallException("Could not connect to the database");
}
@@ -79,8 +78,7 @@ namespace Umbraco.Web.Install.InstallSteps
try
{
//Since a connection string was present we verify the db can connect and query
- var result = _databaseBuilder.ValidateDatabaseSchema();
- result.DetermineInstalledVersion();
+ _ = _databaseBuilder.ValidateSchema();
return false;
}
catch (Exception ex)
diff --git a/src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
index c4cad38072..a9daee6e95 100644
--- a/src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Install.InstallSteps
if (_runtime.Level == RuntimeLevel.Run)
throw new Exception("Umbraco is already configured!");
- var result = _databaseBuilder.CreateDatabaseSchemaAndData();
+ var result = _databaseBuilder.CreateSchemaAndData();
if (result.Success == false)
{
diff --git a/src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs b/src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
index c078caf906..8283eb6bef 100644
--- a/src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
@@ -63,18 +63,10 @@ namespace Umbraco.Web.Install.InstallSteps
if (_databaseBuilder.IsConnectionStringConfigured(databaseSettings))
{
- //Since a connection string was present we verify whether this is an upgrade or an empty db
- var result = _databaseBuilder.ValidateDatabaseSchema();
-
- var determinedVersion = result.DetermineInstalledVersion();
- if (determinedVersion.Equals(new Version(0, 0, 0)))
- {
- //Fresh install
- return false;
- }
-
- //Upgrade
- return true;
+ // a connection string was present, determine whether this is an install/upgrade
+ // return true (upgrade) if there is an installed version, else false (install)
+ var result = _databaseBuilder.ValidateSchema();
+ return result.DetermineHasInstalledVersion();
}
//no connection string configured, probably a fresh install
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 1b8128b4c0..667cf145bd 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -142,7 +142,7 @@ namespace Umbraco.Web.Models
public abstract PublishedItemType ItemType { get; }
///
- public abstract bool IsDraft { get; }
+ public abstract bool IsDraft(string culture = null);
#endregion
diff --git a/src/Umbraco.Web/Models/TemplateQuery/Operathor.cs b/src/Umbraco.Web/Models/TemplateQuery/Operator.cs
similarity index 90%
rename from src/Umbraco.Web/Models/TemplateQuery/Operathor.cs
rename to src/Umbraco.Web/Models/TemplateQuery/Operator.cs
index 561caec362..135c43507e 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/Operathor.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/Operator.cs
@@ -1,6 +1,6 @@
namespace Umbraco.Web.Models.TemplateQuery
{
- public enum Operathor
+ public enum Operator
{
Equals = 1,
NotEquals = 2,
diff --git a/src/Umbraco.Web/Models/TemplateQuery/OperathorTerm.cs b/src/Umbraco.Web/Models/TemplateQuery/OperatorTerm.cs
similarity index 56%
rename from src/Umbraco.Web/Models/TemplateQuery/OperathorTerm.cs
rename to src/Umbraco.Web/Models/TemplateQuery/OperatorTerm.cs
index c14e1854aa..086f0ff818 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/OperathorTerm.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/OperatorTerm.cs
@@ -2,24 +2,24 @@
namespace Umbraco.Web.Models.TemplateQuery
{
- public class OperathorTerm
+ public class OperatorTerm
{
- public OperathorTerm()
+ public OperatorTerm()
{
Name = "is";
- Operathor = Operathor.Equals;
+ Operator = Operator.Equals;
AppliesTo = new [] { "string" };
}
- public OperathorTerm(string name, Operathor operathor, IEnumerable appliesTo)
+ public OperatorTerm(string name, Operator @operator, IEnumerable appliesTo)
{
Name = name;
- Operathor = operathor;
+ Operator = @operator;
AppliesTo = appliesTo;
}
public string Name { get; set; }
- public Operathor Operathor { get; set; }
+ public Operator Operator { get; set; }
public IEnumerable AppliesTo { get; set; }
}
}
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
index 8ba943756f..9c5f2c80c0 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
@@ -4,7 +4,7 @@
{
public PropertyModel Property { get; set; }
- public OperathorTerm Term { get; set; }
+ public OperatorTerm Term { get; set; }
public string ConstraintValue { get; set; }
}
@@ -53,30 +53,30 @@
}
- switch (condition.Term.Operathor)
+ switch (condition.Term.Operator)
{
- case Operathor.Equals:
+ case Operator.Equals:
operand = " == ";
break;
- case Operathor.NotEquals:
+ case Operator.NotEquals:
operand = " != ";
break;
- case Operathor.GreaterThan:
+ case Operator.GreaterThan:
operand = " > ";
break;
- case Operathor.GreaterThanEqualTo:
+ case Operator.GreaterThanEqualTo:
operand = " >= ";
break;
- case Operathor.LessThan:
+ case Operator.LessThan:
operand = " < ";
break;
- case Operathor.LessThanEqualTo:
+ case Operator.LessThanEqualTo:
operand = " <= ";
break;
- case Operathor.Contains:
+ case Operator.Contains:
value = string.Format("{0}{1}.Contains({2})", prefix, condition.Property.Alias, constraintValue);
break;
- case Operathor.NotContains:
+ case Operator.NotContains:
value = string.Format("!{0}{1}.Contains({2})", prefix, condition.Property.Alias, constraintValue);
break;
default :
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 07c5aac5bb..74c8744ead 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -175,13 +175,17 @@ namespace Umbraco.Web.PropertyEditors
{
// create a temp property with the value
var tempProp = new Property(propType);
- tempProp.SetValue(propValues[propAlias] == null ? null : propValues[propAlias].ToString());
+ // if the property varies by culture, make sure we save using the current culture
+ var propCulture = propType.VariesByCulture() || propType.VariesByCultureAndSegment()
+ ? culture
+ : null;
+ tempProp.SetValue(propValues[propAlias] == null ? null : propValues[propAlias].ToString(), propCulture);
// convert that temp property, and store the converted value
var propEditor = _propertyEditors[propType.PropertyEditorAlias];
var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
var valEditor = propEditor.GetValueEditor(tempConfig);
- var convValue = valEditor.ToEditor(tempProp, dataTypeService);
+ var convValue = valEditor.ToEditor(tempProp, dataTypeService, propCulture);
propValues[propAlias] = convValue == null ? null : JToken.FromObject(convValue);
}
catch (InvalidOperationException)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index edef545d2a..0197d2d640 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -147,7 +147,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
var urlSegment = n.GetUrlSegment(culture);
var hasDomains = _domainHelper.NodeHasDomains(n.Id);
while (hasDomains == false && n != null) // n is null at root
- {
+ {
// no segment indicates this is not published when this is a variant
if (urlSegment.IsNullOrWhiteSpace()) return null;
@@ -173,7 +173,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
var path = "/" + string.Join("/", pathParts); // will be "/" or "/foo" or "/foo/bar" etc
//prefix the root node id containing the domain if it exists (this is a standard way of creating route paths)
//and is done so that we know the ID of the domain node for the path
- var route = (n?.Id.ToString(CultureInfo.InvariantCulture) ?? "") + path;
+ var route = (n?.Id.ToString(CultureInfo.InvariantCulture) ?? "") + path;
return route;
}
@@ -223,24 +223,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override IPublishedContent GetById(bool preview, int contentId)
{
- var n = _snapshot.Get(contentId);
- if (n == null) return null;
-
- // both .Draft and .Published cannot be null at the same time
- return preview
- ? n.Draft ?? GetPublishedContentAsPreviewing(n.Published)
- : n.Published;
+ var node = _snapshot.Get(contentId);
+ return GetNodePublishedContent(node, preview);
}
public override IPublishedContent GetById(bool preview, Guid contentId)
{
- var n = _snapshot.Get(contentId);
- if (n == null) return null;
-
- // both .Draft and .Published cannot be null at the same time
- return preview
- ? n.Draft ?? GetPublishedContentAsPreviewing(n.Published)
- : n.Published;
+ var node = _snapshot.Get(contentId);
+ return GetNodePublishedContent(node, preview);
}
public override bool HasById(bool preview, int contentId)
@@ -274,14 +264,24 @@ namespace Umbraco.Web.PublishedCache.NuCache
var c = _snapshot.GetAtRoot();
// both .Draft and .Published cannot be null at the same time
- return c.Select(n => preview
- ? n.Draft ?? GetPublishedContentAsPreviewing(n.Published)
- : n.Published).WhereNotNull().OrderBy(x => x.SortOrder);
+ return c.Select(n => GetNodePublishedContent(n, preview)).WhereNotNull().OrderBy(x => x.SortOrder);
+ }
+
+ private static IPublishedContent GetNodePublishedContent(ContentNode node, bool preview)
+ {
+ if (node == null)
+ return null;
+
+ // both .Draft and .Published cannot be null at the same time
+
+ return preview
+ ? node.Draft ?? GetPublishedContentAsDraft(node.Published)
+ : node.Published;
}
// gets a published content as a previewing draft, if preview is true
// this is for published content when previewing
- internal static IPublishedContent GetPublishedContentAsPreviewing(IPublishedContent content /*, bool preview*/)
+ private static IPublishedContent GetPublishedContentAsDraft(IPublishedContent content /*, bool preview*/)
{
if (content == null /*|| preview == false*/) return null; //content;
@@ -290,7 +290,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// case we need to unwrap to get to the original IPublishedContentOrMedia.
var inner = PublishedContent.UnwrapIPublishedContent(content);
- return inner.AsPreviewingModel();
+ return inner.AsDraft();
}
public override bool HasContent(bool preview)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
index be3e813275..0f120024cc 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
@@ -1,5 +1,6 @@
using Newtonsoft.Json;
using System.Collections.Generic;
+using Umbraco.Core.Serialization;
namespace Umbraco.Web.PublishedCache.NuCache.DataSource
{
@@ -9,9 +10,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
internal class ContentNestedData
{
[JsonProperty("properties")]
+ [JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
public Dictionary PropertyData { get; set; }
[JsonProperty("cultureData")]
+ [JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
public Dictionary CultureData { get; set; }
}
}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index 50a2adaeb8..c6e603f5a9 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -13,5 +13,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
[JsonProperty("date")]
public DateTime Date { get; set; }
+
+ [JsonProperty("isDraft")]
+ public bool IsDraft { get; set; }
}
}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index a143997fab..4531d37b2b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -182,27 +182,30 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
ContentData d = null;
ContentData p = null;
- if (dto.EditData == null)
+ if (dto.Edited)
{
- if (Debugger.IsAttached)
- throw new Exception("Missing cmsContentNu edited content for node " + dto.Id + ", consider rebuilding.");
- Current.Logger.Warn("Missing cmsContentNu edited content for node {NodeId}, consider rebuilding.", dto.Id);
- }
- else
- {
- var nested = DeserializeNestedData(dto.EditData);
-
- d = new ContentData
+ if (dto.EditData == null)
{
- Name = dto.EditName,
- Published = false,
- TemplateId = dto.EditTemplateId,
- VersionId = dto.VersionId,
- VersionDate = dto.EditVersionDate,
- WriterId = dto.EditWriterId,
- Properties = nested.PropertyData,
- CultureInfos = nested.CultureData
- };
+ if (Debugger.IsAttached)
+ throw new Exception("Missing cmsContentNu edited content for node " + dto.Id + ", consider rebuilding.");
+ Current.Logger.Warn("Missing cmsContentNu edited content for node {NodeId}, consider rebuilding.", dto.Id);
+ }
+ else
+ {
+ var nested = DeserializeNestedData(dto.EditData);
+
+ d = new ContentData
+ {
+ Name = dto.EditName,
+ Published = false,
+ TemplateId = dto.EditTemplateId,
+ VersionId = dto.VersionId,
+ VersionDate = dto.EditVersionDate,
+ WriterId = dto.EditWriterId,
+ Properties = nested.PropertyData,
+ CultureInfos = nested.CultureData
+ };
+ }
}
if (dto.Published)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContent.cs
index ae34d0cb32..51badc8b9a 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContent.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.Navigable
XmlString(i++, _content.WriterId),
XmlString(i++, _content.CreatorId),
XmlString(i++, _content.UrlSegment),
- XmlString(i, _content.IsDraft)
+ XmlString(i, _content.IsDraft())
};
}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index a4610e82db..36e5698e32 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -273,8 +273,27 @@ namespace Umbraco.Web.PublishedCache.NuCache
///
public override PublishedItemType ItemType => _contentNode.ContentType.ItemType;
+ // fixme
+ // was => _contentData.Published == false;
///
- public override bool IsDraft => _contentData.Published == false;
+ public override bool IsDraft(string culture = null)
+ {
+ // if this is the 'published' published content, nothing can be draft
+ if (_contentData.Published)
+ return false;
+
+ // not the 'published' published content, and does not vary = must be draft
+ if (!ContentType.VariesByCulture())
+ return true;
+
+ // handle context culture
+ if (culture == null)
+ culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
+
+ // not the 'published' published content, and varies
+ // = depends on the culture
+ return _contentData.CultureInfos.TryGetValue(culture, out var cvar) && cvar.IsDraft;
+ }
#endregion
@@ -410,7 +429,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
private string AsPreviewingCacheKey => _asPreviewingCacheKey ?? (_asPreviewingCacheKey = CacheKeys.PublishedContentAsPreviewing(Key));
// used by ContentCache
- internal IPublishedContent AsPreviewingModel()
+ internal IPublishedContent AsDraft()
{
if (IsPreviewing)
return this;
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 100833216e..4d6115f02d 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1206,7 +1206,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
foreach (var (culture, info) in infos)
{
- cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue };
+ var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(culture);
+ cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
}
}
diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
index 44ce2328b7..56c8f440d8 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
@@ -79,7 +79,7 @@ namespace Umbraco.Web.PublishedCache
public override PublishedItemType ItemType => PublishedItemType.Member;
- public override bool IsDraft => false;
+ public override bool IsDraft(string culture = null) => false;
public override IPublishedContent Parent => null;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
index c9d3c79ff5..7c311236c0 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
@@ -176,7 +176,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
public override int Level => _level;
- public override bool IsDraft => false;
+ public override bool IsDraft(string culture = null) => false;
public override IEnumerable Properties => _properties;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index 3c143a6066..af867cc089 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -221,13 +221,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
}
}
- public override bool IsDraft
+ public override bool IsDraft(string culture = null)
{
- get
- {
- EnsureNodeInitialized();
- return _isDraft;
- }
+ EnsureNodeInitialized();
+ return _isDraft; // bah
}
public override IEnumerable Properties
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 8deec5d92a..709b1ff9e6 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -142,50 +142,35 @@ namespace Umbraco.Web
#endregion
- // fixme - .HasValue() and .Value() refactoring - in progress - see exceptions below
-
- #region HasValue
+ #region HasValue, Value, Value
///
/// Gets a value indicating whether the content has a value for a property identified by its alias.
///
/// The content.
/// The property alias.
- /// A value indicating whether to navigate the tree upwards until a property with a value is found.
+ /// The variation language.
+ /// The variation segment.
+ /// Optional fallback strategy.
/// A value indicating whether the content has a value for the property identified by the alias.
- /// Returns true if GetProperty(alias, recurse) is not null and GetProperty(alias, recurse).HasValue is true.
- public static bool HasValue(this IPublishedContent content, string alias, bool recurse)
+ /// Returns true if HasValue is true, or a fallback strategy can provide a value.
+ public static bool HasValue(this IPublishedContent content, string alias, string culture = null, string segment = null, Fallback fallback = default)
{
- throw new NotImplementedException("WorkInProgress");
+ var property = content.GetProperty(alias);
- //var prop = content.GetProperty(alias, recurse);
- //return prop != null && prop.HasValue();
+ // if we have a property, and it has a value, return that value
+ if (property != null && property.HasValue(culture, segment))
+ return true;
+
+ // else let fallback try to get a value
+ // fixme - really?
+ if (PublishedValueFallback.TryGetValue(content, alias, culture, segment, fallback, null, out _))
+ return true;
+
+ // else... no
+ return false;
}
- ///
- /// Returns one of two strings depending on whether the content has a value for a property identified by its alias.
- ///
- /// The content.
- /// The property alias.
- /// A value indicating whether to navigate the tree upwards until a property with a value is found.
- /// The value to return if the content has a value for the property.
- /// The value to return if the content has no value for the property.
- /// Either or depending on whether the content
- /// has a value for the property identified by the alias.
- public static IHtmlString HasValue(this IPublishedContent content, string alias, bool recurse,
- string valueIfTrue, string valueIfFalse = null)
- {
- throw new NotImplementedException("WorkInProgress");
-
- //return content.HasValue(alias, recurse)
- // ? new HtmlString(valueIfTrue)
- // : new HtmlString(valueIfFalse ?? string.Empty);
- }
-
- #endregion
-
- #region Value
-
///
/// Gets the value of a content's property identified by its alias, if it exists, otherwise a default value.
///
@@ -208,15 +193,14 @@ namespace Umbraco.Web
if (PublishedValueFallback.TryGetValue(content, alias, culture, segment, fallback, defaultValue, out var value))
return value;
+ if (property == null)
+ return null;
+
// else... if we have a property, at least let the converter return its own
- // vision of 'no value' (could be an empty enumerable) - otherwise, default
- return property?.GetValue(culture, segment);
+ // vision of 'no value' (could be an empty enumerable)
+ return property.GetValue(culture, segment);
}
- #endregion
-
- #region Value
-
///
/// Gets the value of a content's property identified by its alias, converted to a specified type.
///
@@ -372,16 +356,6 @@ namespace Umbraco.Web
return recursive && content.IsComposedOf(docTypeAlias);
}
- public static bool IsNull(this IPublishedContent content, string alias, bool recurse)
- {
- return content.HasValue(alias, recurse) == false;
- }
-
- public static bool IsNull(this IPublishedContent content, string alias)
- {
- return content.HasValue(alias) == false;
- }
-
#endregion
#region IsSomething: equality
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index ccd9a7ef7d..0d27253466 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -127,12 +127,8 @@ namespace Umbraco.Web.Runtime
composition.Container.RegisterUmbracoControllers(typeLoader, GetType().Assembly);
composition.Container.EnableWebApi(GlobalConfiguration.Configuration);
- //we aren't scanning for ISearchableTree since that is not IDiscoverable, instead we'll just filter what we've
- //already scanned since all of our ISearchableTree is of type UmbracoApiController and in most cases any developers'
- //own trees they want searched will also be of type UmbracoApiController. If a developer wants to replace one of ours
- //then they will have to manually register/replace.
composition.Container.RegisterCollectionBuilder()
- .Add(() => typeLoader.GetTypes().Where(x => x.Implements()));
+ .Add(() => typeLoader.GetTypes());
composition.Container.Register(new PerRequestLifeTime());
diff --git a/src/Umbraco.Web/Search/SearchableTreeCollection.cs b/src/Umbraco.Web/Search/SearchableTreeCollection.cs
index 81ee0a2898..38c329cafa 100644
--- a/src/Umbraco.Web/Search/SearchableTreeCollection.cs
+++ b/src/Umbraco.Web/Search/SearchableTreeCollection.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
+using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Services;
using Umbraco.Web.Trees;
@@ -22,11 +24,11 @@ namespace Umbraco.Web.Search
var appTrees = treeService.GetAll()
.OrderBy(x => x.SortOrder)
.ToArray();
- var dictionary = new Dictionary();
+ var dictionary = new Dictionary(StringComparer.OrdinalIgnoreCase);
var searchableTrees = this.ToArray();
foreach (var appTree in appTrees)
{
- var found = searchableTrees.FirstOrDefault(x => x.TreeAlias == appTree.Alias);
+ var found = searchableTrees.FirstOrDefault(x => x.TreeAlias.InvariantEquals(appTree.Alias));
if (found != null)
{
dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.ApplicationAlias, appTree.Alias, found);
diff --git a/src/Umbraco.Web/Trees/ISearchableTree.cs b/src/Umbraco.Web/Trees/ISearchableTree.cs
index 4146bfaf45..3d82d548c8 100644
--- a/src/Umbraco.Web/Trees/ISearchableTree.cs
+++ b/src/Umbraco.Web/Trees/ISearchableTree.cs
@@ -1,9 +1,10 @@
using System.Collections.Generic;
+using Umbraco.Core.Composing;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.Trees
{
- public interface ISearchableTree
+ public interface ISearchableTree : IDiscoverable
{
///
/// The alias of the tree that the belongs to
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9c44539f92..48efa9df13 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -525,9 +525,6 @@
-
- ASPXCodeBehind
-
@@ -685,8 +682,8 @@
-
-
+
+
@@ -1166,9 +1163,6 @@
ASPXCodeBehind
-
- ASPXCodeBehind
-
ASPXCodeBehind
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index e8d395881c..219e2101be 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -467,9 +467,9 @@ namespace umbraco
get { return PublishedItemType.Content; }
}
- public bool IsDraft
+ public bool IsDraft(string culture = null)
{
- get { throw new NotImplementedException(); }
+ throw new NotImplementedException();
}
public IPublishedContent Parent
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs
deleted file mode 100644
index f1a05c1185..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace umbraco
-{
- ///
- /// Summary description for _Default.
- ///
- public partial class _Default : System.Web.UI.Page
- {
- protected void Page_Load(object sender, System.EventArgs e)
- {
- //var mvcHandler = new MvcHandler()
- //Server.TransferRequest();
- //Server.Transfer("~/Umbraco/Default");
- //Server.Transfer("umbraco.aspx");
- // Put user code to initialize the page here
- }
-
- ///
- /// Form1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlForm Form1;
-
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs
deleted file mode 100644
index 822f346705..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Web;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web.PublishedCache;
-
-namespace umbraco.presentation
-{
- public class endPreview : Page
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- var request = (new HttpRequestWrapper(Request));
-
- var previewToken = request.GetPreviewCookieValue();
- var service = Current.PublishedSnapshotService;
- service.ExitPreview(previewToken);
-
- HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
-
- var redir = Request.QueryString["redir"];
- Uri url = null;
-
- if (Uri.IsWellFormedUriString(redir, UriKind.Relative) == false
- || redir.StartsWith("//")
- || Uri.TryCreate(redir, UriKind.Relative, out url) == false)
- {
- Response.Redirect("/", true);
- }
-
- Response.Redirect(url.ToString(), true);
- }
- }
-}