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

#19866: oEmbed media could not be moved

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-07-05 12:45:54 -07:00
parent a035c27927
commit 8aae36cf60
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
View File

@@ -134,10 +134,15 @@ namespace Orchard.MediaLibrary.Controllers {
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
foreach (var media in Services.ContentManager.Query().ForPart<MediaPart>().ForContentItems(mediaItemIds).List()) { foreach (var media in Services.ContentManager.Query().ForPart<MediaPart>().ForContentItems(mediaItemIds).List()) {
var uniqueFilename = _mediaLibraryService.GetUniqueFilename(folderPath, media.FileName);
_mediaLibraryService.MoveFile(media.FolderPath, media.FileName, folderPath, uniqueFilename); // don't try to rename the file if there is no associated media file
if (!String.IsNullOrEmpty(media.FileName)) {
var uniqueFilename = _mediaLibraryService.GetUniqueFilename(folderPath, media.FileName);
_mediaLibraryService.MoveFile(media.FolderPath, media.FileName, folderPath, uniqueFilename);
media.FileName = uniqueFilename;
}
media.FolderPath = folderPath; media.FolderPath = folderPath;
media.FileName = uniqueFilename;
} }
return Json(true); return Json(true);

4
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/OEmbedController.cs
View File

@@ -80,7 +80,7 @@ namespace Orchard.MediaLibrary.Controllers {
var part = Services.ContentManager.New<MediaPart>("OEmbed"); var part = Services.ContentManager.New<MediaPart>("OEmbed");
part.FileName = url;
part.MimeType = "text/html"; part.MimeType = "text/html";
part.FolderPath = folderPath; part.FolderPath = folderPath;
part.Title = oembed.Element("title").Value; part.Title = oembed.Element("title").Value;
@@ -89,6 +89,8 @@ namespace Orchard.MediaLibrary.Controllers {
} }
var oembedPart = part.As<OEmbedPart>(); var oembedPart = part.As<OEmbedPart>();
oembedPart.Source = url;
foreach (var element in oembed.Elements()) { foreach (var element in oembed.Elements()) {
oembedPart[element.Name.LocalName] = element.Value; oembedPart[element.Name.LocalName] = element.Value;
} }

4
src/Orchard.Web/Modules/Orchard.MediaLibrary/Models/OEmbedPart.cs
View File

@@ -9,5 +9,9 @@ namespace Orchard.MediaLibrary.Models {
set { this.As<InfosetPart>().Set("OEmbedPart", index, null, value); } set { this.As<InfosetPart>().Set("OEmbedPart", index, null, value); }
} }
public string Source {
get { return this.As<InfosetPart>().Get("OEmbedPart", "Source"); }
set { this.As<InfosetPart>().Set("OEmbedPart", "Source", value); }
}
} }
} }

8
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/OEmbed.Summary.cshtml
View File

@@ -1,10 +1,8 @@
@using Orchard.ContentManagement @using Orchard.MediaLibrary.Models
@using Orchard.MediaLibrary.Models
@{ @{
OEmbedPart oembedPart = Model.ContentPart; OEmbedPart oEmbedPart = Model.ContentPart;
var mediaPart = ((ContentItem)Model.ContentItem).As<MediaPart>();
} }
<a href="@mediaPart.MediaUrl" target="_blank" class="button"> <a href="@oEmbedPart["src"]" target="_blank" class="button">
<span>@T("Preview")</span> <span>@T("Preview")</span>
</a> </a>

6
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/OEmbed.SummaryAdmin.cshtml
View File

@@ -1,10 +1,8 @@
@using Orchard.ContentManagement @using Orchard.MediaLibrary.Models
@using Orchard.MediaLibrary.Models
@{ @{
OEmbedPart oEmbedPart = Model.ContentPart; OEmbedPart oEmbedPart = Model.ContentPart;
var mediaPart = ((ContentItem)Model.ContentItem).As<MediaPart>();
} }
<a href="@mediaPart.MediaUrl" target="_blank" class="button"> <a href="@oEmbedPart.Source" target="_blank" class="button">
<span>@T("Preview")</span> <span>@T("Preview")</span>
</a> </a>