Quellcode durchsuchen

TableAjax fix error handling in saving record

Piotr Labudda vor 11 Jahren
Ursprung
Commit
e0af899f6c
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 4 4
      SE/se-lib/TableAjax.php

+ 4 - 4
SE/se-lib/TableAjax.php

@@ -3332,15 +3332,14 @@ jQuery(document).ready(function(){
 			url: 'index-ajax.php?_zasobID=<?php echo $this->_zasobID; ?>&_cls=<?php echo __CLASS__; ?>&_hash=<?php echo $this->_htmlID; ?>&_task=CREATE_SAVE'
 		})
 		.always(function(dataOrJqXHR){
-			console.log('dataOrJqXHR (isXHR: ', (dataOrJqXHR && 'readyState' in dataOrJqXHR), ')', dataOrJqXHR);
 			var data;
-			if (dataOrJqXHR && 'readyState' in dataOrJqXHR) {
+			if (dataOrJqXHR && 'readyState' in dataOrJqXHR && 'status' in dataOrJqXHR) {
 				if ('responseJSON' in dataOrJqXHR) {
 					data = dataOrJqXHR.responseJSON;
 				} else {
 					data = {};
-					data.msg = jqXHR.responseText || 'Nieznany błąd';
-					if (jqXHR.status == 404) {
+					data.msg = dataOrJqXHR.responseText || 'Nieznany błąd';
+					if (dataOrJqXHR.status == 404) {
 						data.type = 'error';
 					} else {
 						data.type = 'warning';
@@ -3359,6 +3358,7 @@ jQuery(document).ready(function(){
 				var out = '<div class="container">' + 
 						'<div class="alert alert-error">' +
 							'<h4>Wystąpiły błędy!</h4>' + data.msg +
+							(('errors' in data)? '<p>' + data.errors + '</p>' : '') +
 						'</div>';
 				out += '<div class="breadcrumb">' +
 							' <a class="create-fix" href="#CREATE/' + Math.random(1).toString().substr(2) + '" class="btn btn-link btn-small"> <i class="icon-arrow-left"></i> Wróć do formularza i popraw dane</a></li>' +