Commit 76ae3132 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4625 (Missing handling of some failing AJAX scripts (3 cases))

parent 1b89711d
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -672,6 +672,8 @@ function set_up_comcode_autocomplete(name,wysiwyg)
				do_ajax_request(
					'{$FIND_SCRIPT;,namelike}?id='+window.encodeURIComponent(token)+keep_stub(),
					function(result,list_contents) {
						if (!list_contents) return;

						var new_values = [];
						for (var i=0;i<list_contents.childNodes.length;i++)
						{
+7 −2
Original line number Diff line number Diff line
@@ -574,8 +574,13 @@ function set_permissions(setting)
		if (set_request!='')
		{
			set_request=modsecurity_workaround_ajax(set_request);
			do_ajax_request('{$BASE_URL_NOHTTP;}/data/sitemap.php?set_perms=1'+keep_stub(),function() {
			do_ajax_request('{$BASE_URL_NOHTTP;}/data/sitemap.php?set_perms=1'+keep_stub(),function(ajax_result) {
				if (ajax_result.status!=500)
				{
					window.fauxmodal_alert('{!permissions:PERMISSIONS_TREE_EDITOR_SAVED;^}');
				} else {
					window.fauxmodal_alert('{!permissions:INTERNAL_ERROR;^}');
				}
			},set_request);
			return;
		}
+8 −3
Original line number Diff line number Diff line
@@ -1119,10 +1119,15 @@ function handle_form_saving_explicit(event,form)
			{
				post=modsecurity_workaround_ajax(post);
				do_ajax_request('{$FIND_SCRIPT_NOHTTP;,autosave}?type=store'+keep_stub(),function() {
					if (ajax_result.status!=500)
					{
						if (document.body.style.cursor=='wait') document.body.style.cursor='';

						var message=found_validated_field?'{!javascript:DRAFT_SAVED_WITH_VALIDATION;^}':'{!javascript:DRAFT_SAVED_WITHOUT_VALIDATION;^}';
						fauxmodal_alert(message,null,'{!javascript:DRAFT_SAVE;^}');
					} else {
						fauxmodal_alert('{!INTERNAL_ERROR;^}');
					}
				},post);
			}
		}