Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19023 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Sat 2015-04-25 14:29:02 +0200
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.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-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-04-25 11:22:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-04-25 12:28:25 +0000
@@ -1931,10 +1931,20 @@
var info = Ext.decode(r.responseText),
divStyle = 'padding:3px';
- html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' <b>ago</b></div>';
- html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
- html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
- html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+ if (Ext.isObject(info)) {
+ html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' <b>ago</b></div>';
+ html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
+ html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
+ html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+ }
+ else {
+ html += 'No system info found';
+ }
+
+ w.update(html);
+ },
+ failure: function(r) {
+ html += r.status + '\n' + r.statusText + '\n' + r.responseText;
w.update(html);
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
