------------------------------------------------------------
revno: 18705
committer: Abyot Asalefew Gizaw <[email protected]>
branch nick: dhis2
timestamp: Fri 2015-03-27 10:49:12 +0100
message:
bug fix for setting storedBy of notes
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.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-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-03-25 16:43:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-03-27 09:49:12 +0000
@@ -24,11 +24,9 @@
$scope.currentPeriod = [];
$scope.filterEvents = true;
- var loginDetails = storage.get('LOGIN_DETAILS');
- var storedBy = '';
- if(loginDetails){
- storedBy = loginDetails.userCredentials.username;
- }
+ var userProfile = storage.get('USER_PROFILE');
+ var storedBy = userProfile && userProfile.username ? userProfile.username : '';
+
var today = DateUtils.getToday();
$scope.invalidDate = false;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2015-03-09 15:56:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2015-03-27 09:49:12 +0000
@@ -6,11 +6,8 @@
CurrentSelection,
orderByFilter) {
- var loginDetails = storage.get('LOGIN_DETAILS');
- var storedBy = '';
- if(loginDetails && loginDetails.userCredentials){
- storedBy = loginDetails.userCredentials.username;
- }
+ var userProfile = storage.get('USER_PROFILE');
+ var storedBy = userProfile && userProfile.username ? userProfile.username : '';
var today = DateUtils.getToday();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
