dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9010
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-13 18:22:23 +0100
message:
  Showing modules in alphabetical order in main menu
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml


--
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/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2012-10-05 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2012-11-13 17:22:23 +0000
@@ -242,6 +242,8 @@
         }
 
         Collections.sort( menuModules, moduleComparator );
+        Collections.sort( maintenanceMenuModules, moduleComparator );
+        Collections.sort( serviceMenuModules, moduleComparator );
 
         modulesDetected = true;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2012-10-29 20:17:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2012-11-13 17:22:23 +0000
@@ -17,14 +17,24 @@
   <bean id="org.hisp.dhis.webportal.module.ConfigurableModuleComparator" class="org.hisp.dhis.webportal.module.ConfigurableModuleComparator">
     <property name="order">
       <list>
-        <value>dhis-web-portal</value>
+        <value>dhis-web-maintenance-dataadmin</value>
+        <value>dhis-web-maintenance-datadictionary</value>
+        <value>dhis-web-maintenance-dataset</value>
+        <value>dhis-web-maintenance-mobile</value>
+        <value>dhis-web-maintenance-organisationunit</value>
+        <value>dhis-web-maintenance-patient</value>
         <value>dhis-web-maintenance-settings</value>
         <value>dhis-web-maintenance-user</value>
-        <value>dhis-web-maintenance-organisationunit</value>
-        <value>dhis-web-maintenance-datadictionary</value>
-        <value>dhis-web-maintenance-dataset</value>
-        <value>dhis-web-maintenance-dataadmin</value>
+        <value>dhis-web-dashboard-integration</value>
         <value>dhis-web-dataentry</value>
+        <value>dhis-web-validationrule</value>
+        <value>dhis-web-visualizer</value>
+        <value>dhis-web-mapping</value>
+        <value>dhis-web-importexport</value>
+        <value>dhis-web-caseentry</value>
+        <value>dhis-web-light</value>
+        <value>dhis-web-mobile</value>
+        <value>dhis-web-reporting</value>
       </list>
     </property>
   </bean>