dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6236 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-09 17:52:14 +0100
message:
  (DV) Orgunit group set logic bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-03-09 02:44:12 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-03-09 16:50:49 +0000
@@ -1160,7 +1160,7 @@
         },
         variable: {
 			hasValue: function(str) {
-				return (str & str !== 0 && str !== '0' && str !== '');
+				return (str !== 0 && str !== '0' && str !== '');
 			}
 		},
        /*FIXME:This is probably not going to work as intended with UNICODE?*/
@@ -1865,7 +1865,7 @@
             Ext.Ajax.request({
                 url: baseurl,
                 success: function(r) {
-                    DV.value.values = DV.util.value.jsonfy(r);
+                    DV.value.values = DV.util.value.jsonfy(r);                    
                     
                     if (!DV.state.validation.value()) {
 						return;