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

#18100 : Various MediaPicker alert screens showing garbage

Browse Source 
--HG--
branch : 1.x
extra : transplant_source : %7D%04o%7F1%BD%AAk%96h%DC%F9%81%9D%F1%DC%05%0C%80%A2
This commit is contained in:
blelem
2011-09-26 20:35:52 +03:00
parent 6225a96138
commit 7aabfcd4c0
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaBrowser.js
View File

@@ -48,15 +48,14 @@
if ($(this).hasClass("disabled")) return;
$.post("MediaPicker/CreateFolder", { path: query("mediaPath") || "", folderName: $("#folderName").val(), __RequestVerificationToken: $("#__requesttoken").val() },
function (response) {
if (response.Success == true) {
if (response.Success) {
location.reload(true);
} else if (response.Success == false) {
} else if (response.Success === false) {
alert(response.Message);
} else {
// Most likely a redirection due to expired authorisation
alert($("#AccessDeniedMsg").val());
var loginWindow = window.open($("#LoginUrl").val(), "AccessDenied", 'toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,copyhistory=no,resizable=yes');
}
} else if (response.indexOf($.mediaPicker.logonUrl) !== -1) {
// A redirection due to expired authorization
alert($.mediaPicker.accessDeniedMsg);
} else alert($.mediaPicker.cannotPerformMsg);
});
});
@@ -115,7 +114,7 @@
img = data ? data.img : null;
}
catch (ex) {
alert($("#LostCallbackMsg").val());
alert($.mediaPicker.cannotPerformMsg);
window.close();
}
@@ -160,7 +159,7 @@
window.opener.jQuery[query("callback")]({ img: img });
}
catch (ex) {
alert($("#LostCallbackMsg").val());
alert($.mediaPicker.cannotPerformMsg);
}
window.close();
}
@@ -296,8 +295,7 @@
alert(result.error);
}
else if (frame.location.pathname.match("AccessDenied")) {
alert($("#AccessDeniedMsg").val());
window.open($("#LoginUrl").val(), "AccessDenied", 'toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,copyhistory=no,resizable=yes');
alert($.mediaPicker.accessDeniedMsg);
}
else {
var somethingPotentiallyHorrible = "";

11
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml
View File

@@ -29,11 +29,12 @@
</head>
<body id="orchardmediapicker">
<form id="ErrorHandlingValues">
<input type="hidden" id="LostCallbackMsg" value="@T("Cannot perform requested operation")" />
<input type="hidden" id="AccessDeniedMsg" value="@T("Authentification timed-out: please log-on again")" />
<input type="hidden" id="LoginUrl" value="@Url.Action("LogIn", new { Controller = "Account", Area = "Orchard.Users" })" />
</form>
<script type="text/javascript">
$.mediaPicker.cannotPerformMsg="@T("Cannot perform requested operation")";
$.mediaPicker.accessDeniedMsg="@T("Authentification timed-out: please log-on again")";
$.mediaPicker.logonUrl="@Url.Action("LogOn", new { Controller = "Account", Area = "Orchard.Users" })";
</script>
<div id="tabs" class="group">
<ul>
<li><a href="#tab-url" data-edittext="@T("Update/Upload Image")" data-edittext-content="true">@T("Insert/Upload Image")</a></li>