(), props);
var prop1 = new SolidPublishedPropertyWithLanguageVariants
{
Alias = "welcomeText",
+ PropertyType = welcomeType
};
prop1.SetSourceValue("en-US", "Welcome", true);
prop1.SetValue("en-US", "Welcome", true);
@@ -84,6 +88,7 @@ namespace Umbraco.Tests.PublishedContent
var prop2 = new SolidPublishedPropertyWithLanguageVariants
{
Alias = "welcomeText2",
+ PropertyType = welcome2Type
};
prop2.SetSourceValue("en-US", "Welcome", true);
prop2.SetValue("en-US", "Welcome", true);
@@ -91,6 +96,7 @@ namespace Umbraco.Tests.PublishedContent
var prop3 = new SolidPublishedPropertyWithLanguageVariants
{
Alias = "welcomeText",
+ PropertyType = welcomeType
};
prop3.SetSourceValue("en-US", "Welcome", true);
prop3.SetValue("en-US", "Welcome", true);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index be07dbdd23..f25382d557 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Services.Implement;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;
+using Umbraco.Core.Components;
namespace Umbraco.Tests.Services
{
@@ -23,6 +24,361 @@ namespace Umbraco.Tests.Services
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
public class ContentTypeServiceTests : TestWithSomeContentBase
{
+ [Test]
+ public void Change_Content_Type_Variation_Clears_Redirects()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Nothing;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Nothing
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+ var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+ ServiceContext.ContentTypeService.Save(contentType2);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.Name = "Hello1";
+ ServiceContext.ContentService.Save(doc);
+
+ IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+ ServiceContext.ContentService.Save(doc2);
+
+ ServiceContext.RedirectUrlService.Register("hello/world", doc.Key);
+ ServiceContext.RedirectUrlService.Register("hello2/world2", doc2.Key);
+
+ Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+ Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+
+ //change variation
+ contentType.Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ Assert.AreEqual(0, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+ Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+
+ }
+
+ [Test]
+ public void Change_Content_Type_From_Invariant_Variant()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Nothing;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Nothing
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.Name = "Hello1";
+ doc.SetValue("title", "hello world");
+ ServiceContext.ContentService.Save(doc);
+
+ Assert.AreEqual("Hello1", doc.Name);
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+
+ //change the content type to be variant, we will also update the name here to detect the copy changes
+ doc.Name = "Hello2";
+ ServiceContext.ContentService.Save(doc);
+ contentType.Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
+ Assert.AreEqual("hello world", doc.GetValue("title")); //We are not checking against en-US here because properties will remain invariant
+
+ //change back property type to be invariant, we will also update the name here to detect the copy changes
+ doc.SetCultureName("Hello3", "en-US");
+ ServiceContext.ContentService.Save(doc);
+ contentType.Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("Hello3", doc.Name);
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+ }
+
+ [Test]
+ public void Change_Content_Type_From_Variant_Invariant()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Culture;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Culture
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.SetCultureName("Hello1", "en-US");
+ doc.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc);
+
+ Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+ //change the content type to be invariant, we will also update the name here to detect the copy changes
+ doc.SetCultureName("Hello2", "en-US");
+ ServiceContext.ContentService.Save(doc);
+ contentType.Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("Hello2", doc.Name);
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+
+ //change back property type to be variant, we will also update the name here to detect the copy changes
+ doc.Name = "Hello3";
+ ServiceContext.ContentService.Save(doc);
+ contentType.Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ //at this stage all property types were switched to invariant so even though the variant value
+ //exists it will not be returned because the property type is invariant,
+ //so this check proves that null will be returned
+ Assert.IsNull(doc.GetValue("title", "en-US"));
+
+ //we can now switch the property type to be variant and the value can be returned again
+ contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+ }
+
+ [Test]
+ public void Change_Property_Type_From_Invariant_Variant()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Nothing;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Nothing
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.Name = "Home";
+ doc.SetValue("title", "hello world");
+ ServiceContext.ContentService.Save(doc);
+
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+
+ //change the property type to be variant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+ //change back property type to be invariant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+ }
+
+ [Test]
+ public void Change_Property_Type_From_Variant_Invariant()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Culture;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Culture
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.SetCultureName("Home", "en-US");
+ doc.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc);
+
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+ //change the property type to be invariant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+
+ //change back property type to be variant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+ }
+
+ [Test]
+ public void Change_Property_Type_From_Variant_Invariant_On_A_Composition()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Culture;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Culture
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //compose this from the other one
+ var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+ contentType2.Variations = ContentVariation.Culture;
+ contentType2.AddContentType(contentType);
+ ServiceContext.ContentTypeService.Save(contentType2);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.SetCultureName("Home", "en-US");
+ doc.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc);
+
+ IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+ doc2.SetCultureName("Home", "en-US");
+ doc2.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc2);
+
+ //change the property type to be invariant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+ doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+ Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+ //change back property type to be variant
+ contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+ doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+ Assert.AreEqual("hello world", doc2.GetValue("title", "en-US"));
+ }
+
+ [Test]
+ public void Change_Content_Type_From_Variant_Invariant_On_A_Composition()
+ {
+ //create content type with a property type that varies by culture
+ var contentType = MockedContentTypes.CreateBasicContentType();
+ contentType.Variations = ContentVariation.Culture;
+ var contentCollection = new PropertyTypeCollection(true);
+ contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+ {
+ Alias = "title",
+ Name = "Title",
+ Description = "",
+ Mandatory = false,
+ SortOrder = 1,
+ DataTypeId = -88,
+ Variations = ContentVariation.Culture
+ });
+ contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+ ServiceContext.ContentTypeService.Save(contentType);
+
+ //compose this from the other one
+ var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+ contentType2.Variations = ContentVariation.Culture;
+ contentType2.AddContentType(contentType);
+ ServiceContext.ContentTypeService.Save(contentType2);
+
+ //create some content of this content type
+ IContent doc = MockedContent.CreateBasicContent(contentType);
+ doc.SetCultureName("Home", "en-US");
+ doc.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc);
+
+ IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+ doc2.SetCultureName("Home", "en-US");
+ doc2.SetValue("title", "hello world", "en-US");
+ ServiceContext.ContentService.Save(doc2);
+
+ //change the content type to be invariant
+ contentType.Variations = ContentVariation.Nothing;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+ doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+ Assert.AreEqual("hello world", doc.GetValue("title"));
+ Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+ //change back content type to be variant
+ contentType.Variations = ContentVariation.Culture;
+ ServiceContext.ContentTypeService.Save(contentType);
+ doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+ doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+ //this will be null because the doc type was changed back to variant but it's property types don't get changed back
+ Assert.IsNull(doc.GetValue("title", "en-US"));
+ Assert.IsNull(doc2.GetValue("title", "en-US"));
+ }
+
[Test]
public void Deleting_Media_Type_With_Hierarchy_Of_Media_Items_Moves_Orphaned_Media_To_Recycle_Bin()
{
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 0d346f74dd..61ae537529 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -123,6 +123,7 @@
Added in Umbraco version 8.0
+This directive is a wrapper of the flatpickr library. Use it to render a date time picker.
+For extra details about options and events take a look here: https://flatpickr.js.org/
+
+Use this directive to render a date time picker
+
+Markup example
+
+
+
+
+
+
+
+
+
+Controller example
+
+ (function () {
+ "use strict";
+
+ function Controller() {
+
+ var vm = this;
+
+ vm.date = "2018-10-10 10:00";
+
+ vm.config = {
+ enableTime: true,
+ dateFormat: "Y-m-d H:i",
+ time_24hr: true
+ };
+
+ vm.datePickerChange = datePickerChange;
+
+ function datePickerChange(selectedDates, dateStr, instance) {
+ // handle change
+ }
+
+ }
+
+ angular.module("umbraco").controller("My.Controller", Controller);
+
+ })();
+
+
+@param {object} ngModel (binding): Config object for the date picker.
+@param {object} options (binding): Config object for the date picker.
+@param {callback} onSetup (callback): onSetup gets triggered when the date picker is initialized
+@param {callback} onChange (callback): onChange gets triggered when the user selects a date, or changes the time on a selected date.
+@param {callback} onOpen (callback): onOpen gets triggered when the calendar is opened.
+@param {callback} onClose (callback): onClose gets triggered when the calendar is closed.
+@param {callback} onMonthChange (callback): onMonthChange gets triggered when the month is changed, either by the user or programmatically.
+@param {callback} onYearChange (callback): onMonthChange gets triggered when the year is changed, either by the user or programmatically.
+@param {callback} onReady (callback): onReady gets triggered once the calendar is in a ready state.
+@param {callback} onValueUpdate (callback): onValueUpdate gets triggered when the input value is updated with a new date string.
+@param {callback} onDayCreate (callback): Take full control of every date cell with theonDayCreate()hook.
+**/
+
+(function() {
+ 'use strict';
+
+ var umbFlatpickr = {
+ template: '' +
+ '
' +
+ ' ',
+ controller: umbFlatpickrCtrl,
+ transclude: true,
+ bindings: {
+ ngModel: '<',
+ options: '<',
+ onSetup: '&?',
+ onChange: '&?',
+ onOpen: '&?',
+ onClose: '&?',
+ onMonthChange: '&?',
+ onYearChange: '&?',
+ onReady: '&?',
+ onValueUpdate: '&?',
+ onDayCreate: '&?'
+ }
+ };
+
+ function umbFlatpickrCtrl($element, $timeout, $scope, assetsService) {
+ var ctrl = this;
+ var loaded = false;
+
+ ctrl.$onInit = function() {
+
+ // load css file for the date picker
+ assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope);
+
+ // load the js file for the date picker
+ assetsService.loadJs('lib/flatpickr/flatpickr.js', $scope).then(function () {
+ // init date picker
+ loaded = true;
+ grabElementAndRunFlatpickr();
+ });
+
+ };
+
+ function grabElementAndRunFlatpickr() {
+ $timeout(function() {
+ var transcludeEl = $element.find('ng-transclude')[0];
+ var element = transcludeEl.children[0];
+
+ setDatepicker(element);
+ }, 0, true);
+ }
+
+ function setDatepicker(element) {
+ var fpLib = flatpickr ? flatpickr : FlatpickrInstance;
+
+ if (!fpLib) {
+ return console.warn('Unable to find any flatpickr installation');
+ }
+
+ setUpCallbacks();
+
+ var fpInstance = new fpLib(element, ctrl.options);
+
+ if (ctrl.onSetup) {
+ ctrl.onSetup({
+ fpItem: fpInstance
+ });
+ }
+
+ // If has ngModel set the date
+ if (ctrl.ngModel) {
+ fpInstance.setDate(ctrl.ngModel);
+ }
+
+ // destroy the flatpickr instance when the dom element is removed
+ angular.element(element).on('$destroy', function() {
+ fpInstance.destroy();
+ });
+
+ // Refresh the scope
+ $scope.$applyAsync();
+ }
+
+ function setUpCallbacks() {
+ // bind hook for onChange
+ if(ctrl.options && ctrl.onChange) {
+ ctrl.options.onChange = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onChange({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onOpen
+ if(ctrl.options && ctrl.onOpen) {
+ ctrl.options.onOpen = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onOpen({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onOpen
+ if(ctrl.options && ctrl.onClose) {
+ ctrl.options.onClose = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onClose({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onMonthChange
+ if(ctrl.options && ctrl.onMonthChange) {
+ ctrl.options.onMonthChange = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onMonthChange({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onYearChange
+ if(ctrl.options && ctrl.onYearChange) {
+ ctrl.options.onYearChange = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onYearChange({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onReady
+ if(ctrl.options && ctrl.onReady) {
+ ctrl.options.onReady = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onReady({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onValueUpdate
+ if(ctrl.onValueUpdate) {
+ ctrl.options.onValueUpdate = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onValueUpdate({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ // bind hook for onDayCreate
+ if(ctrl.onDayCreate) {
+ ctrl.options.onDayCreate = function(selectedDates, dateStr, instance) {
+ $timeout(function() {
+ ctrl.onDayCreate({selectedDates: selectedDates, dateStr: dateStr, instance: instance});
+ });
+ };
+ }
+
+ }
+ }
+
+ angular.module('umbraco.directives').component('umbFlatpickr', umbFlatpickr);
+
+})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
index 554134d017..8fd6836884 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
@@ -104,52 +104,52 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
* @returns {Int} the ID assigned to the saved package manifest
*
*/
- import: function (package) {
+ import: function (umbPackage) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"packageInstallApiBaseUrl",
- "Import"), package),
+ "Import"), umbPackage),
'Failed to install package. Error during the step "Import" ');
},
- installFiles: function (package) {
+ installFiles: function (umbPackage) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"packageInstallApiBaseUrl",
- "InstallFiles"), package),
+ "InstallFiles"), umbPackage),
'Failed to install package. Error during the step "InstallFiles" ');
},
- checkRestart: function (package) {
+ checkRestart: function (umbPackage) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"packageInstallApiBaseUrl",
- "CheckRestart"), package),
+ "CheckRestart"), umbPackage),
'Failed to install package. Error during the step "CheckRestart" ');
},
- installData: function (package) {
+ installData: function (umbPackage) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"packageInstallApiBaseUrl",
- "InstallData"), package),
+ "InstallData"), umbPackage),
'Failed to install package. Error during the step "InstallData" ');
},
- cleanUp: function (package) {
+ cleanUp: function (umbPackage) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"packageInstallApiBaseUrl",
- "CleanUp"), package),
+ "CleanUp"), umbPackage),
'Failed to install package. Error during the step "CleanUp" ');
}
};
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 ba2df1a68a..777b336447 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
@@ -146,7 +146,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
if (!args.methods) {
throw "args.methods is not defined";
}
- if (!args.methods.saveAndPublish || !args.methods.sendToPublish || !args.methods.unpublish) {
+ if (!args.methods.saveAndPublish || !args.methods.sendToPublish || !args.methods.unpublish || !args.methods.schedulePublish) {
throw "args.methods does not contain all required defined methods";
}
@@ -190,6 +190,16 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
alias: "unpublish",
addEllipsis: args.content.variants && args.content.variants.length > 1 ? "true" : "false"
};
+ case "SCHEDULE":
+ //schedule publish - schedule doesn't have a permission letter so
+ // the button letter is made unique so it doesn't collide with anything else
+ return {
+ letter: ch,
+ labelKey: "buttons_schedulePublish",
+ handler: args.methods.schedulePublish,
+ alias: "schedulePublish",
+ addEllipsis: "true"
+ };
default:
return null;
}
@@ -200,7 +210,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//This is the ideal button order but depends on circumstance, we'll use this array to create the button list
// Publish, SendToPublish
- var buttonOrder = ["U", "H"];
+ var buttonOrder = ["U", "H", "SCHEDULE"];
//Create the first button (primary button)
//We cannot have the Save or SaveAndPublish buttons if they don't have create permissions when we are creating a new item.
@@ -215,6 +225,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
break;
}
}
+
//Here's the special check, if the button still isn't set and we are creating and they have create access
//we need to add the Save button
if (!buttons.defaultButton && args.create && _.contains(args.content.allowedActions, "C")) {
@@ -237,6 +248,12 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
}
+ // if publishing is allowed also allow schedule publish
+ // we add this manually becuase it doesn't have a permission so it wont
+ // get picked up by the loop through permissions
+ if( _.contains(args.content.allowedActions, "U")) {
+ buttons.subButtons.push(createButtonDefinition("SCHEDULE"));
+ }
// if we are not creating, then we should add unpublish too,
// so long as it's already published and if the user has access to publish
@@ -249,40 +266,6 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
}
- // If we have a scheduled publish or unpublish date change the default button to
- // "save" and update the label to "save and schedule
- if (args.content.releaseDate || args.content.removeDate) {
-
- // if save button is alread the default don't change it just update the label
- if (buttons.defaultButton && buttons.defaultButton.letter === "A") {
- buttons.defaultButton.labelKey = "buttons_saveAndSchedule";
- return buttons;
- }
-
- if (buttons.defaultButton && buttons.subButtons && buttons.subButtons.length > 0) {
- // save a copy of the default so we can push it to the sub buttons later
- var defaultButtonCopy = angular.copy(buttons.defaultButton);
- var newSubButtons = [];
-
- // if save button is not the default button - find it and make it the default
- angular.forEach(buttons.subButtons, function (subButton) {
-
- if (subButton.letter === "A") {
- buttons.defaultButton = subButton;
- buttons.defaultButton.labelKey = "buttons_saveAndSchedule";
- } else {
- newSubButtons.push(subButton);
- }
-
- });
-
- // push old default button into subbuttons
- newSubButtons.push(defaultButtonCopy);
- buttons.subButtons = newSubButtons;
- }
-
- }
-
return buttons;
},
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index cc98ec306b..ac8279e3ab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -96,6 +96,7 @@
@import "components/tree/umb-actions.less";
@import "components/tree/umb-tree-item.less";
+
@import "components/editor.less";
@import "components/overlays.less";
@import "components/card.less";
@@ -104,6 +105,7 @@
@import "components/umb-editor-navigation.less";
@import "components/umb-editor-sub-views.less";
@import "components/editor/subheader/umb-editor-sub-header.less";
+@import "components/umb-flatpickr.less";
@import "components/umb-grid-selector.less";
@import "components/umb-child-selector.less";
@import "components/umb-group-builder.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 3fbe32134b..6538a751f9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -75,7 +75,7 @@
/* ---------- OVERLAY CENTER ---------- */
.umb-overlay.umb-overlay-center {
position: absolute;
- width: 500px;
+ width: 600px;
height: auto;
top: 50%;
left: 50%;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
new file mode 100644
index 0000000000..1848d55d96
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
@@ -0,0 +1,21 @@
+.flatpickr-calendar.flatpickr-calendar {
+ border-radius: @baseBorderRadius;
+ box-shadow: 0 5px 10px 0 rgba(0,0,0,0.16);
+}
+
+span.flatpickr-day {
+ border-radius: @baseBorderRadius;
+ border: none;
+}
+
+span.flatpickr-day:hover {
+ background-color: @gray-10;
+}
+
+span.flatpickr-day.selected {
+ background-color: @turquoise;
+}
+
+span.flatpickr-day.selected:hover {
+ background-color: @turquoise-d1;
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 6d567c5fb3..0284a79865 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -48,6 +48,7 @@ h5.-black {
border: none
}
.bootstrap-datetimepicker-widget {
+ width: auto !important;
td {
&.active, span.active {
background: @turquoise !important;
diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index 06f05ab0aa..916f1b5a3a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -1,61 +1,19 @@
//----- SCHEDULED PUBLISH ------
-.place-holder {
- height: 60px;
- width: 60px;
- margin: 15px auto;
- background-color: @gray-8;
-}
-
.date-wrapper {
display: flex;
- justify-content: space-around;
flex-direction: row;
+ border-top: 1px solid @gray-10;
+ border-bottom: 1px solid @gray-10;
}
-.date-container {
- text-align: center;
+.date-wrapper__date {
+ padding: 10px;
+ flex: 1 1 50%;
}
-.date-wrapper__number{
- font-size: 40px;
- line-height: 50px;
- color: @gray-2;
- font-weight: 900;
-}
-
-.date-container__title {
- font-size: 16px;
- font-weight: bold;
- color: @gray-3;
- margin-bottom: 5px;
-}
-
-.date-container__date {
- padding: 0 10px;
-}
-.date-container__date:hover {
- background-color: @gray-10;
- cursor: pointer;
-}
-
-.date-wrapper__date{
- font-size: 13px;
- color: @gray-6;
- margin: 0;
-}
-
-.data-wrapper__add{
- font-size: 18px;
- line-height: 10px;
- color: @gray-8;
- font-weight: 900;
- margin: 0;
-}
-
-.date-separate {
- width: 1px;
- background-color: @gray-8;
+.date-wrapper__date:last-of-type {
+ border-left: 1px solid @gray-10;
}
//------------------- HISTORY ------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index c2e5df6f30..03d4318ba2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -112,78 +112,7 @@