lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19619: Fixing item pickers url when have a request prefix

Browse Source 
Work Item: 19619

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-04-22 15:54:54 -07:00
parent 06815541dd
commit eb11f0250d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Fields/ContentPicker.Edit.cshtml
View File

@@ -1,4 +1,5 @@
@model Orchard.ContentPicker.ViewModels.ContentPickerFieldViewModel
@using Orchard.Environment.Configuration
@using Orchard.Utility.Extensions;
@using Orchard.ContentPicker.Settings;
@@ -8,6 +9,7 @@
Style.Include("content-picker-admin.css");
var settings = Model.Field.PartFieldDefinition.Settings.GetModel<ContentPickerFieldSettings>();
var baseUrl = Url.Content("~/") + WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
}
<fieldset>
@@ -87,7 +89,7 @@
refreshIds();
$('#save-message-@Html.FieldIdFor(m => m.Field.Ids)').show();
},
baseUrl: '@Url.Content("~/")',
baseUrl: '@baseUrl',
part: '@HttpUtility.JavaScriptStringEncode(Model.Part.PartDefinition.Name)',
field: '@HttpUtility.JavaScriptStringEncode(Model.Field.PartFieldDefinition.Name)'
});

9
src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/MediaGallery.Edit.cshtml
View File

@@ -1,4 +1,5 @@
@model MediaGalleryFieldViewModel
@using Orchard.Environment.Configuration
@using Orchard.Fields.Settings;
@{
@@ -7,6 +8,8 @@
var settings = Model.Field.PartFieldDefinition.Settings.GetModel<MediaGalleryFieldSettings>();
var descriminator = Html.FieldIdFor(m => m.Field.Items);
var baseUrl = Url.Content("~/") + WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
}
<fieldset>
@@ -98,7 +101,7 @@
refreshIds();
$('#save-message-@descriminator').show();
},
baseUrl: '@Url.Content("~/")'
baseUrl: '@baseUrl'
});
});
@@ -106,7 +109,7 @@
$(".items.media-gallery").on("click", ".media-gallery-edit", function() {
var img = extractModel($(this).parent());
if (img.Url && img.Url.length > 2 && img.Url.substr(0, 2) == "~/") {
img.Url = '@Url.Content("~/")' + img.Url.substr(2);
img.Url = '@baseUrl' + img.Url.substr(2);
}
var tr = $(this).closest('tr');
@@ -121,7 +124,7 @@
width: img.Width,
height: img.Height
},
baseUrl: '@Url.Content("~/")',
baseUrl: '@baseUrl',
//uploadMediaPath: 'images',
callback: function (data) {