← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #35678

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18257: Hide list of objects, applied to index pages

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 18257
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-13 14:52:12 +0100
message:
  Hide list of objects, applied to index pages
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm


--
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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2015-02-13 13:52:12 +0000
@@ -1,19 +1,19 @@
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
 <ul class="introList">
-	#introListImgItem( "dataElement.action" "data_element" "dataelement" )
-	#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
-    #introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )
-    #introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "groupset" )
-    #introListImgItem( "categoryOptionCombo.action" "category_option_combo" "category" )
-    #introListImgItem( "categoryOption.action" "category_option" "category" )
-    #introListImgItem( "category.action" "category" "category" )
-    #introListImgItem( "categoryCombo.action" "category_combo" "category" )
-    #introListImgItem( "categoryOptionGroup.action" "category_option_group" "category" )
-    #introListImgItem( "categoryOptionGroupSet.action" "category_option_group_set" "category" )
-    #introListImgItem( "indicator.action" "indicator" "indicator" )
-    #introListImgItem( "indicatorType.action" "indicator_type" "indicator" )
-    #introListImgItem( "indicatorGroup.action" "indicator_group" "indicator" )
-    #introListImgItem( "indicatorGroupEditor.action" "indicator_group_editor" "indicator" )
-    #introListImgItem( "indicatorGroupSet.action" "indicator_group_set" "groupset" )
+	#if( $security.canView( "dataElement" ) )#introListImgItem( "dataElement.action" "data_element" "dataelement" )#end
+	#if( $security.canView( "dataElementGroup" ) )#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )#end
+    #if( $security.canView( "dataElementGroup" ) )#introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )#end
+    #if( $security.canView( "dataElementGroupSet" ) )#introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "groupset" )#end
+    #if( $security.canView( "categoryOptionCombo" ) )#introListImgItem( "categoryOptionCombo.action" "category_option_combo" "category" )#end
+    #if( $security.canView( "categoryOption" ) )#introListImgItem( "categoryOption.action" "category_option" "category" )#end
+    #if( $security.canView( "category" ) )#introListImgItem( "category.action" "category" "category" )#end
+    #if( $security.canView( "categoryCombo" ) )#introListImgItem( "categoryCombo.action" "category_combo" "category" )#end
+    #if( $security.canView( "categoryOptionGroup" ) )#introListImgItem( "categoryOptionGroup.action" "category_option_group" "category" )#end
+    #if( $security.canView( "categoryOptionGroupSet" ) )#introListImgItem( "categoryOptionGroupSet.action" "category_option_group_set" "category" )#end
+    #if( $security.canView( "indicator" ) )#introListImgItem( "indicator.action" "indicator" "indicator" )#end
+    #if( $security.canView( "indicatorType" ) )#introListImgItem( "indicatorType.action" "indicator_type" "indicator" )#end
+    #if( $security.canView( "indicatorGroup" ) )#introListImgItem( "indicatorGroup.action" "indicator_group" "indicator" )#end
+    #if( $security.canView( "indicatorGroup" ) )#introListImgItem( "indicatorGroupEditor.action" "indicator_group_editor" "indicator" )#end
+    #if( $security.canView( "indicatorGroupSet" ) )#introListImgItem( "indicatorGroupSet.action" "indicator_group_set" "groupset" )#end
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2014-12-22 16:00:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2015-02-13 13:52:12 +0000
@@ -1,6 +1,6 @@
 <h3>$i18n.getString( "dhis-web-maintenance-dataset" ) #openHelp( "datasets" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "dataSet.action" "dataset" "dataset" )
-    #introListImgItem( "displayEditorForm.action" "dataset_assignment_editor" "assignment" )
+    #if( $security.canView( "dataSet" ) )#introListImgItem( "dataSet.action" "dataset" "dataset" )#end
+    #if( $security.canView( "dataSet" ) )#introListImgItem( "displayEditorForm.action" "dataset_assignment_editor" "assignment" )#end
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2015-02-13 13:52:12 +0000
@@ -1,10 +1,10 @@
 <h3>$i18n.getString( "dhis-web-maintenance-organisationunit" ) #openHelp( "ou_hierarchy" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )
-    #introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )
-    #introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "groupset" )
-    #introListImgItem( "organisationUnitLevel.action" "org_unit_level" "hierarchy" )
+    #if( $security.canView( "organisationUnit" ) )#introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )#end
+    #if( $security.canView( "organisationUnitGroup" ) )#introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )#end
+    #if( $security.canView( "organisationUnitGroupSet" ) )#introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "groupset" )#end
+    #if( $currentUser.isAuthorized( "F_ORGANISATIONUNITLEVEL_UPDATE" ) )#introListImgItem( "organisationUnitLevel.action" "org_unit_level" "hierarchy" )#end
     #introListImgItem( "organisationUnitSearch.action?skipSearch=true" "org_unit_search" "search" )
-    #introListImgItem( "hierarchyOperations.action" "hierarchy_operations_menu" "hierarchy" )
+    #if( $currentUser.isAuthorized( "F_ORGANISATIONUNIT_MOVE" ) )#introListImgItem( "hierarchyOperations.action" "hierarchy_operations_menu" "hierarchy" )#end
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm	2014-04-14 12:42:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm	2015-02-13 13:52:12 +0000
@@ -1,12 +1,12 @@
 <h3>$i18n.getString( "dhis-web-maintenance-program" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "attribute.action" "attribute" "patient" )
-    #introListImgItem( "attributeGroup.action" "attribute_group" "patient" )
-    #introListImgItem( "relationshipType.action" "relationship_type" "patient" )
-    #introListImgItem( "trackedEntity.action" "tracked_entity" "patient" )
-    #introListImgItem( "trackedEntityForm.action" "tracked_entity_form" "pivottable" )
-    #introListImgItem( "program.action" "program" "program" )
+    #if( $security.canView( "trackedEntityAttribute" ) )#introListImgItem( "attribute.action" "attribute" "patient" )#end
+    #if( $security.canView( "trackedEntityAttributeGroup" ) )#introListImgItem( "attributeGroup.action" "attribute_group" "patient" )#end
+    #if( $security.canView( "relationShipType" ) )#introListImgItem( "relationshipType.action" "relationship_type" "patient" )#end
+    #if( $security.canView( "trackedEntity" ) )#introListImgItem( "trackedEntity.action" "tracked_entity" "patient" )#end
+    #if( $security.canView( "trackedEntityForm" ) )#introListImgItem( "trackedEntityForm.action" "tracked_entity_form" "pivottable" )#end
+    #if( $security.canView( "program" ) )#introListImgItem( "program.action" "program" "program" )#end
     #introListImgItem( "caseAggregation.action" "aggregation_query_builder" "caseaggregationmapping" )
 	
 	#if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2014-12-30 14:29:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2015-02-13 13:52:12 +0000
@@ -1,8 +1,8 @@
 <h3>$i18n.getString( "dhis-web-maintenance-user" ) #openHelp( "users" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "user.action" "user_by_orgunit" "user" )
-    #introListImgItem( "alluser.action" "user" "user" )
-    #introListImgItem( "allRole.action" "user_role" "user" )
-    #introListImgItem( "getAllUserGroups.action" "user_group" "user" )
+    #if( $security.canView( "user" ) )#introListImgItem( "user.action" "user_by_orgunit" "user" )#end
+    #if( $security.canView( "user" ) )#introListImgItem( "alluser.action" "user" "user" )#end
+    #if( $security.canView( "userRole" ) )#introListImgItem( "allRole.action" "user_role" "user" )#end
+    #if( $security.canView( "userGroup" ) )#introListImgItem( "getAllUserGroups.action" "user_group" "user" )#end
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm	2015-02-13 12:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm	2015-02-13 13:52:12 +0000
@@ -2,7 +2,7 @@
 <ul>
 	#if( $security.canView( "user" ) )<li><a href="user.action">$i18n.getString( "user_by_orgunit" )&nbsp;</a></li>#end
 	#if( $security.canView( "user" ) )<li><a href="alluser.action">$i18n.getString( "user" )&nbsp;</a></li>#end
-	#if( $security.canView( "trackedEntityAttribute" ) )<li><a href="allRole.action" title="$i18n.getString( "user_role" )">$i18n.getString( "user_role" )&nbsp;</a></li>#end
-    <li><a href="deleteCurrentUser.action" title="$i18n.getString( "delete_current_user" )">$i18n.getString( "delete_current_user" )</a></li>
+	#if( $security.canView( "userRole" ) )<li><a href="allRole.action" title="$i18n.getString( "user_role" )">$i18n.getString( "user_role" )&nbsp;</a></li>#end
 	#if( $security.canView( "userGroup" ) )<li><a href="getAllUserGroups.action">$i18n.getString( "user_group" )</a></li>#end
+	<li><a href="deleteCurrentUser.action" title="$i18n.getString( "delete_current_user" )">$i18n.getString( "delete_current_user" )</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2014-10-13 16:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2015-02-13 13:52:12 +0000
@@ -1,8 +1,8 @@
 <h3>$i18n.getString( "dhis-web-validationrule" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "validationRule.action" "validation_rule" "validationrule" )
-    #introListImgItem( "validationRuleGroup.action" "validation_rule_group" "validationrule" )
+    #if( $security.canView( "validationRule" ) )#introListImgItem( "validationRule.action" "validation_rule" "validationrule" )#end
+    #if( $security.canView( "validationRuleGroup" ) )#introListImgItem( "validationRuleGroup.action" "validation_rule_group" "validationrule" )#end
     #introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )
     #introListImgItem( "viewAnalysisForm.action?key=stddevoutlier" "stddevoutlier_analysis" "validationanalysis" )
     #introListImgItem( "viewAnalysisForm.action?key=minmaxoutlier" "minmaxoutlier_analysis" "validationanalysis" )

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm	2014-10-13 16:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm	2015-02-13 13:52:12 +0000
@@ -1,8 +1,8 @@
 
 <h2>$i18n.getString( "validation_rule" )&nbsp;</h2>
 <ul>
-	<li><a href="validationRule.action">$i18n.getString( "validation_rule" )&nbsp;</a></li>
-	<li><a href="validationRuleGroup.action">$i18n.getString( "validation_rule_group" )&nbsp;</a></li>
+	#if( $security.canView( "validationRule" ) )<li><a href="validationRule.action">$i18n.getString( "validation_rule" )&nbsp;</a></li>#end
+	#if( $security.canView( "validationRuleGroup" ) )<li><a href="validationRuleGroup.action">$i18n.getString( "validation_rule_group" )&nbsp;</a></li>#end
 </ul>
 
 <h2>$i18n.getString( "data_analysis" )&nbsp;</h2>
  Thread Previous • Date Previous • • Thread Next