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

Multi Url Picker fixes (#4527)

Browse Source 
*  Fix not being able to save link with only an anchor

* Don't allow Multi Url Picker as a parameter editor
This commit is contained in:
Rasmus John Pedersen
2019-02-14 18:11:44 +01:00
committed by Sebastiaan Janssen
parent 6665695986
commit 3a469cdc77
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
View File

@@ -73,7 +73,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
currentTarget: target,
show: true,
submit: function (model) {
if (model.target.url) {
if (model.target.url || model.target.anchor) {
// if an anchor exists, check that it is appropriately prefixed
if (model.target.anchor && model.target.anchor[0] !== '?' && model.target.anchor[0] !== '#') {
model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor;
@@ -87,14 +87,14 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
link.isMedia = model.target.isMedia;
}
link.name = model.target.name || model.target.url;
link.name = model.target.name || model.target.url || model.target.anchor;
link.queryString = model.target.anchor;
link.target = model.target.target;
link.url = model.target.url;
} else {
link = {
isMedia: model.target.isMedia,
name: model.target.name || model.target.url,
name: model.target.name || model.target.url || model.target.anchor,
queryString: model.target.anchor,
target: model.target.target,
udi: model.target.udi,

4
src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
View File

@@ -15,7 +15,7 @@ using Umbraco.Web.Routing;
namespace Umbraco.Web.PropertyEditors
{
[PropertyEditor(Constants.PropertyEditors.MultiUrlPickerAlias, "Multi Url Picker", PropertyEditorValueTypes.Json, "multiurlpicker", Group = "pickers", Icon = "icon-link", IsParameterEditor = true)]
[PropertyEditor(Constants.PropertyEditors.MultiUrlPickerAlias, "Multi Url Picker", PropertyEditorValueTypes.Json, "multiurlpicker", Group = "pickers", Icon = "icon-link")]
public class MultiUrlPickerPropertyEditor : PropertyEditor
{
protected override PreValueEditor CreatePreValueEditor()
@@ -112,7 +112,7 @@ namespace Umbraco.Web.PropertyEditors
Target = dto.Target,
Trashed = false,
Udi = dto.Udi,
Url = dto.Url,
Url = dto.Url ?? "",
};
links.Add(link);