dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7481
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-02 12:21:54 +0200
message:
  Fixed issue with tabular report
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  resources/sql/div.sql


--
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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java	2012-06-11 08:24:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java	2012-07-02 10:21:54 +0000
@@ -125,9 +125,8 @@
 
         programs = programService.getAllPrograms();
 
-        levels = organisationUnitService.getFilledOrganisationUnitLevels();
+        levels = organisationUnitService.getOrganisationUnitLevels();
 
         return SUCCESS;
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-07-02 08:15:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-07-02 10:21:54 +0000
@@ -70,7 +70,7 @@
   padding: 11px;
   margin-top: 20px;
   display: block;
-  width: 350px;
+  width: 280px;
   border-radius: 2px;
 }
 

=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql	2012-04-14 07:38:49 +0000
+++ resources/sql/div.sql	2012-07-02 10:21:54 +0000
@@ -69,3 +69,6 @@
 where oustr.level >= 5
 order by province, county, district, type, ownership, ou.name;
 
+-- Compare user roles --
+
+select authority from userroleauthorities where userroleid=49836 and authority not in (select authority from userroleauthorities where userroleid=83722);