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

Fixing MediaPicker error when there is no media folder for the tenant.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2011-02-22 11:30:09 -08:00
parent 8456603188
commit 1c09a89280
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.MediaPicker/Controllers/AdminController.cs
View File

@@ -30,8 +30,8 @@ namespace Orchard.MediaPicker.Controllers {
public Localizer T { get; set; } public Localizer T { get; set; }
public ActionResult Index(string name, string mediaPath) { public ActionResult Index(string name, string mediaPath) {
IEnumerable<MediaFile> mediaFiles = _mediaService.GetMediaFiles(mediaPath); var mediaFolders = _mediaService.GetMediaFolders(mediaPath);
IEnumerable<MediaFolder> mediaFolders = _mediaService.GetMediaFolders(mediaPath); var mediaFiles = string.IsNullOrEmpty(mediaPath) ? null : _mediaService.GetMediaFiles(mediaPath);
var model = new MediaFolderEditViewModel { FolderName = name, MediaFiles = mediaFiles, MediaFolders = mediaFolders, MediaPath = mediaPath }; var model = new MediaFolderEditViewModel { FolderName = name, MediaFiles = mediaFiles, MediaFolders = mediaFolders, MediaPath = mediaPath };
ViewData["Service"] = _mediaService; ViewData["Service"] = _mediaService;
return View(model); return View(model);

6
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
View File

@@ -42,8 +42,9 @@
</td> </td>
</tr> </tr>
} }
@foreach (var mediaFile in Model.MediaFiles) { @if (Model.MediaFiles != null) {
var src = (((IMediaService)ViewData["Service"]).GetPublicUrl(Path.Combine(Model.MediaPath, mediaFile.Name))); foreach (var mediaFile in Model.MediaFiles) {
var src = (((IMediaService)ViewData["Service"]).GetPublicUrl(Path.Combine(Model.MediaPath, mediaFile.Name)));
<tr data-imgsrc="@src" class="media-item"> <tr data-imgsrc="@src" class="media-item">
<td class="media-thumbnail"> <td class="media-thumbnail">
<img data-filename="@src.Substring(src.LastIndexOf("/") + 1)" alt="" src="@src" onload="jQuery.mediaPicker.scalePreview(this)" /> <img data-filename="@src.Substring(src.LastIndexOf("/") + 1)" alt="" src="@src" onload="jQuery.mediaPicker.scalePreview(this)" />
@@ -56,6 +57,7 @@
</ul> </ul>
</td> </td>
</tr> </tr>
}
} }
</table> </table>
</div> </div>