SP-881 / BIS-528 : ELN UI : Meaningful error messages.

SVN: 29816

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleForm.js

@@ -554,9 +554,23 @@ function SampleForm(containerId, profile, sampleTypeCode, isELNExperiment, mode,
 	}
 
 	this.createSampleCallback = function(response) {
-		if(response.error) {
+		if(response.error) { //Error Case 1
 			Util.showError(response.error.message, function() {Util.unblockUI();});
-		} else if (response.result.columns[0].title === "STATUS" && response.result.rows[0][0].value === "OK") {
+		} else if (response.result.columns[1].title === "Error") { //Error Case 2
+			var stacktrace = response.result.rows[0][1].value;
+			var isUserFailureException = stacktrace.indexOf("ch.systemsx.cisd.common.exceptions.UserFailureException") === 0;
+			var startIndex = null;
+			var endIndex = null;
+			if(isUserFailureException) {
+				startIndex = "ch.systemsx.cisd.common.exceptions.UserFailureException".length + 2;
+				endIndex = stacktrace.indexOf("at ch.systemsx.cisd.common.exceptions.UserFailureException");
+			} else {
+				startIndex = 0;
+				endIndex = stacktrace.length;
+			}
+			var errorMessage = stacktrace.substring(startIndex, endIndex).trim();
+			Util.showError(errorMessage, function() {Util.unblockUI();});
+		} else if (response.result.columns[0].title === "STATUS" && response.result.rows[0][0].value === "OK") { //Success Case
 			var sampleType = profile.getTypeForTypeCode(this.sampleTypeCode);
 			var sampleTypeDisplayName = sampleType.description;
 			
@@ -568,9 +582,7 @@ function SampleForm(containerId, profile, sampleTypeCode, isELNExperiment, mode,
 			}
 			
 			Util.showSuccess(sampleTypeDisplayName + " " + message, function() {Util.unblockUI();});
-		} else if (response.result.columns[1].title === "Error") {
-			Util.showError(response.result.rows[0][1].value, function() {Util.unblockUI();});
-		} else {
+		} else { //This should never happen
 			Util.showError("Unknown Error.", function() {Util.unblockUI();});
 		}
 		

plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py

@@ -80,6 +80,5 @@ def insertSample(tr, parameters, tableBuilder):
 	if sampleParents != None:
 		sample.setParentSampleIdentifiers(sampleParents);
 	
-	#This requires to access a private method
-	return tr.transaction.commit();
-	
+	#Return from the call
+	return True;
\ No newline at end of file
\ No newline at end of file