yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Routing/PublishedRequest.cs
This commit is contained in:
Sebastiaan Janssen
2019-01-27 13:47:22 +01:00
parent 647d92775c d174499e50
commit cebf1e6c22
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -1294,7 +1294,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
var linkPicker = {
currentTarget: currentTarget,
anchors: self.getAnchorNames(JSON.stringify(editorState.current.properties)),
anchors: editorState.current ? self.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
submit: function (model) {
self.insertLinkInEditor(args.editor, model.target, anchorElement);
editorService.close();

2
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -2038,7 +2038,7 @@ namespace Umbraco.Web.Editors
return display;
}
[EnsureUserPermissionForContent("contentId", 'R')]
[EnsureUserPermissionForContent("contentId", ActionBrowse.ActionLetter)]
public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
{
var notifications = new List<NotifySetting>();

6
src/Umbraco.Web/Routing/PublishedRequest.cs
View File

@@ -491,17 +491,17 @@ namespace Umbraco.Web.Routing
// Note: we used to set a default value here but that would then be the default
// for ALL requests, we shouldn't overwrite it though if people are using [OutputCache] for example
// see: https://our.umbraco.com/forum/using-umbraco-and-getting-started/79715-output-cache-in-umbraco-752
internal HttpCacheability Cacheability { get; set; }
public HttpCacheability Cacheability { get; set; }
/// <summary>
/// Gets or sets a list of Extensions to append to the Response.Cache object.
/// </summary>
internal List<string> CacheExtensions { get; set; } = new List<string>();
public List<string> CacheExtensions { get; set; } = new List<string>();
/// <summary>
/// Gets or sets a dictionary of Headers to append to the Response object.
/// </summary>
internal Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
#endregion