dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16111
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-07-13 09:53:57 +0200
message:
  Data entry, fixed bug, viewing user details for completion when user does not exist in system
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm


--
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/ajax/jsonDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2014-07-13 07:53:57 +0000
@@ -1,6 +1,6 @@
 { "dataElement": 
   {
-    "id": $!{dataElement.id},
+    "id": "$!{dataElement.id}",
 	"uid": "$!dataElement.uid",
     "name": "$!encoder.jsonEncode( ${dataElement.displayName} )",
     "alternativeName": "$!encoder.jsonEncode( ${dataElement.alternativeNamee} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm	2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm	2014-07-13 07:53:57 +0000
@@ -1,6 +1,6 @@
 { "dataElementGroup": 
   {
-    "id": $!{dataElementGroup.id},
+    "id": "$!{dataElementGroup.id}",
     "uid": "$!dataElementGroup.uid",
     "name": "$!encoder.jsonEncode( ${dataElementGroup.displayName} )",
 	"shortName": "$!encoder.jsonEncode( ${dataElementGroup.displayShortName} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm	2014-06-13 07:55:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm	2014-07-13 07:53:57 +0000
@@ -1,6 +1,6 @@
 { "dataSet": 
   {
-    "id": $!{dataSet.id},
+    "id": "$!{dataSet.id}",
     "uid": "$!{dataSet.uid}",
     "name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
     "shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm	2013-12-09 21:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm	2014-07-13 07:53:57 +0000
@@ -1,6 +1,6 @@
 { "organisationUnit": 
   {
-  "id": $!{organisationUnit.id},
+  "id": "$!{organisationUnit.id}",
   "uid": "$!encoder.jsonEncode( ${organisationUnit.uid} )",
   "name": "$!encoder.jsonEncode( ${organisationUnit.name} )",
   "shortName": "$!encoder.jsonEncode( ${organisationUnit.shortName} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2014-06-13 10:58:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2014-07-13 07:53:57 +0000
@@ -1,7 +1,7 @@
 { "program":
   {
-    "id": "$program.id",
-	"uid": "$program.uid",
+	"id": "$!program.id",
+	"uid": "$!program.uid",
 	"name": "$!encoder.jsEncode( ${program.name} )",
 	"description": "$!encoder.jsEncode( ${program.description} )",
 	"type": "$!program.type",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm	2014-06-13 08:08:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm	2014-07-13 07:53:57 +0000
@@ -1,7 +1,7 @@
 { "user":
   {
-    "id": ${user.id},
-    "uid": "${user.uid}",
+    "id": "$!{user.id}",
+    "uid": "$!{user.uid}",
     "surname": "$!encoder.jsonEncode( ${user.surname} )",
     "firstName": "$!encoder.jsonEncode( ${user.firstName} )",
     "username": "$!encoder.jsonEncode( ${user.userCredentials.username} )",
@@ -9,7 +9,7 @@
     "phoneNumber": "$!encoder.jsonEncode( ${user.phoneNumber} )",
     "lastLogin": "$!format.formatDate( ${user.userCredentials.lastLogin} )",	
     "created": "$!format.formatDate( ${user.userCredentials.created} )",
-    "disabled": ${user.userCredentials.disabled},
+    "disabled": "$!{user.userCredentials.disabled}",
     #set( $size = ${user.organisationUnits.size()} )
     "organisationUnits": [
     #foreach( $unit in $user.organisationUnits )