Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1376 Show error dialog when response is empty and there is no Spring redirect header.

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-09-17 09:07:41 +00:00
parent a89f24d954
commit 1402a68f37
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js
View File

@@ -280,6 +280,10 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
}
return response;
}
} else if ((dojo.string.trim(response).length == 0) && (ioArgs.xhr.status != 204) && (ioArgs.xhr.status != 205)) {
if (Spring.debug) {
Spring.remoting.showError('Received empty response with no Spring redirect headers. If this is intentional set the response status code to 204 or 205.');
}
}
//Extract and store all <script> elements from the response
@@ -338,17 +342,15 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
handleError: function(response, ioArgs) {
dojo.require("dijit.Dialog");
console.error("HTTP status code: ", ioArgs.xhr.status);
if (Spring.debug && ioArgs.xhr.status != 200) {
var dialog = new dijit.Dialog({});
var dialog = new dijit.Dialog({ title: 'Ajax Request Error' });
dojo.connect(dialog, "hide", dialog, function(){
this.destroyRecursive(false);
});
dialog.domNode.style.width = "80%";
dialog.domNode.style.height = "80%";
dialog.domNode.style.textAlign = "left";
dialog.domNode.style.overflow = "auto";
dialog.setContent(ioArgs.xhr.responseText);
dialog.show();
}
@@ -356,6 +358,18 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
return response;
},
showError: function(message) {
dojo.require("dijit.Dialog");
var dialog = new dijit.Dialog({ title: 'Error Message' });
dojo.connect(dialog, "hide", dialog, function(){
this.destroyRecursive(false);
});
dialog.domNode.style.width = "500px";
dialog.setContent(message);
dialog.show();
},
_renderURLToModalDialog: function(url) {
Spring.remoting.getResource(url, {}, true);
},

6
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
View File

@@ -8,11 +8,7 @@
<!-- Enables controllers mapped with @RequestMapping annotations, formatting annotations @NumberFormat @DateTimeFormat, and JSR 303 style validation -->
<mvc:annotation-driven/>
<mvc:resources location="classpath:/META-INF/dojo/" mapping="/resources/dojo/**" />
<mvc:resources location="classpath:/META-INF/dijit/" mapping="/resources/dijit/**" />
<mvc:resources location="classpath:/META-INF/spring/" mapping="/resources/spring/**" />
<mvc:resources location="/" mapping="/resources/**" />
<mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/web-resources/" />
<mvc:default-servlet-handler />
<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking". -->