=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-19 21:33:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-25 15:20:12 +0000
@@ -6,6 +6,12 @@
+
+
+ index.html
+
+
+
app/index.html
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2014-08-19 21:02:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2014-08-25 15:20:12 +0000
@@ -1,6 +1,7 @@
+ Apps
- dhis-web-pivot
- dhis-web-visualizer
=== 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 2014-08-16 08:29:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java 2014-08-25 15:20:12 +0000
@@ -33,8 +33,10 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -94,6 +96,13 @@
this.defaultActionName = defaultActionName;
}
+ private Set menuModuleExclusions = new HashSet<>();
+
+ public void setMenuModuleExclusions( Set menuModuleExclusions )
+ {
+ this.menuModuleExclusions = menuModuleExclusions;
+ }
+
// -------------------------------------------------------------------------
// ModuleManager
// -------------------------------------------------------------------------
@@ -182,7 +191,7 @@
if ( packageConfig.getAllActionConfigs().size() == 0 )
{
- log.warn( "Ignoring action package with no actions: " + name );
+ log.debug( "Ignoring action package with no actions: " + name );
continue;
}
@@ -208,8 +217,10 @@
Module module = new Module( name, namespace );
modulesByName.put( name, module );
modulesByNamespace.put( namespace, module );
+
+ boolean include = !menuModuleExclusions.contains( name );
- if ( packageConfig.getActionConfigs().containsKey( defaultActionName ) )
+ if ( packageConfig.getActionConfigs().containsKey( defaultActionName ) && include )
{
module.setDefaultAction( ".." + namespace + "/" + defaultActionName + ".action" );
=== 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 2014-05-28 16:38:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2014-08-25 15:20:12 +0000
@@ -9,6 +9,11 @@
+
+
+ dhis-web-apps
+
+
dhis-web-commons-stream
dhis-web-commons-help
dhis-web-commons-about
+ dhis-web-apps
dhis-web-api-mobile
dhis-web-portal
@@ -274,6 +275,7 @@
dhis-web-commons-stream
dhis-web-commons-help
dhis-web-commons-about
+ dhis-web-apps
dhis-web-api-mobile
dhis-web-portal