lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17160: Displaying clearer error messages in Live Writer

Browse Source 
Work Item: 17160

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-11-28 16:42:32 -08:00
parent e96ea8f47d
commit 737af93b31
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs
View File

@@ -35,8 +35,21 @@ namespace Orchard.Core.XmlRpc.Controllers {
private XRpcMethodResponse Dispatch(XRpcMethodCall request) {
var context = new XmlRpcContext { ControllerContext = ControllerContext, HttpContext = HttpContext, Request = request };
foreach (var handler in _xmlRpcHandlers)
handler.Process(context);
try {
foreach (var handler in _xmlRpcHandlers) {
handler.Process(context);
}
}
catch (OrchardCoreException e) {
// if a core exception is raised, report the error message, otherwise signal a 500
context.Response = context.Response ?? new XRpcMethodResponse();
context.Response.Fault = new XRpcFault {
Code = 0,
Message = e.LocalizedMessage.ToString()
};
}
return context.Response;
}
}

5
src/Orchard.Web/Core/XmlRpc/Models/XRpcData.cs
View File

@@ -39,4 +39,9 @@ namespace Orchard.Core.XmlRpc.Models {
public override Type Type { get { return typeof(T); } }
}
public class XRpcFault {
public string Message { get; set; }
public int Code { get; set; }
}
}

1
src/Orchard.Web/Core/XmlRpc/Models/XRpcMethodResponse.cs
View File

@@ -5,6 +5,7 @@ namespace Orchard.Core.XmlRpc.Models {
public XRpcMethodResponse() { Params = new List<XRpcData>(); }
public IList<XRpcData> Params { get; set; }
public XRpcFault Fault { get; set; }
public XRpcMethodResponse Add<T>(T value) {
Params.Add(XRpcData.For(value));

22
src/Orchard.Web/Core/XmlRpc/Services/XmlRpcWriter.cs
View File

@@ -41,10 +41,24 @@ namespace Orchard.Core.XmlRpc.Services {
public XElement MapMethodResponse(XRpcMethodResponse rpcMethodResponse) {
Argument.ThrowIfNull(rpcMethodResponse, "rpcMethodResponse");
return new XElement(
"methodResponse",
new XElement(
"params",
// return a valid fault as per http://xmlrpc.scripting.com/spec.html
if(rpcMethodResponse.Fault != null) {
return new XElement("methodResponse",
new XElement("fault",
new XElement("value",
new XElement("struct",
new XElement("member",
new XElement("name", "faultCode"),
new XElement("value",
new XElement("int", rpcMethodResponse.Fault.Code))),
new XElement("member",
new XElement("name", "faultString"),
new XElement("value",
new XElement("string", rpcMethodResponse.Fault.Message)))))));
}
return new XElement("methodResponse",
new XElement("params",
rpcMethodResponse.Params.Select(
p => new XElement("param", MapValue(p)))));
}

5
src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
View File

@@ -257,8 +257,9 @@ namespace Orchard.Blogs.Services {
IUser user = ValidateUser(userName, password);
var blogPost = _blogPostService.Get(postId, VersionOptions.DraftRequired);
if (blogPost == null)
throw new ArgumentException();
if (blogPost == null) {
throw new OrchardCoreException(T("The specified Blog Post doesn't exist anymore. Please create a new Blog Post."));
}
_authorizationService.CheckAccess(publish ? Permissions.PublishBlogPost : Permissions.EditBlogPost, user, blogPost);