dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3774
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-05-28 16:40:32 +0200
message:
  Fixed bug, wrong use of js method
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.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	2011-05-09 05:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-05-28 14:40:32 +0000
@@ -1413,13 +1413,13 @@
 
 function relativePeriodsChecked()
 {
-    if ( isChecked( "reportingMonth" ) == true ||
-         isChecked( "monthsThisYear" ) == true ||
-         isChecked( "quartersThisYear" ) == true ||
-         isChecked( "thisYear" ) == true ||
-         isChecked( "monthsLastYear" ) == true ||
-         isChecked( "quartersLastYear" ) == true ||
-         isChecked( "lastYear" ) == true )
+    if ( isChecked( "reportingMonth" ) ||
+         isChecked( "monthsThisYear" ) ||
+         isChecked( "quartersThisYear" ) ||
+         isChecked( "thisYear" ) ||
+         isChecked( "monthsLastYear" ) ||
+         isChecked( "quartersLastYear" ) ||
+         isChecked( "lastYear" ) )
     {
         return true;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2011-03-29 20:06:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2011-05-28 14:40:32 +0000
@@ -115,14 +115,9 @@
 
 function organisationUnitReportParamsChecked()
 {
-    if ( isChecked( "paramGrandParentOrganisationUnit" ) == true ||
-         isChecked( "paramParentOrganisationUnit" ) == true ||
-         isChecked( "paramOrganisationUnit" ) == true )
-    {
-        return true;
-    }
-    
-    return false;
+    return ( isChecked( "paramGrandParentOrganisationUnit" ) ||
+         isChecked( "paramParentOrganisationUnit" ) ||
+         isChecked( "paramOrganisationUnit" ) );
 }
 
 function bothOrganisationUnitReportParamsChecked()
@@ -137,7 +132,7 @@
 	{
 		count++;
 	}
-    if( isChecked( "paramOrganisationUnit" ) )
+    if ( isChecked( "paramOrganisationUnit" ) )
     {
         count++;
     }