dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13175
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-12-08 23:46:57 +0100
message:
  Data import, showing error icon if process fails
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/error_small.png
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-12-08 22:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-12-08 22:46:57 +0000
@@ -1880,7 +1880,11 @@
 				
 				html += '<tr><td>' + time + '</td><td>' + notification.message + ' &nbsp;';
 				
-				if ( notification.completed ) {
+				if ( notification.level == "ERROR" ) {
+					html += '<img src="../images/error_small.png">';
+					isComplete = true;
+				}
+				else if ( notification.completed ) {
 					html += '<img src="../images/completed.png">';
 					isComplete = true;
 				}

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/error_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/error_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/error_small.png	2013-12-08 22:46:57 +0000 differ