dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20676
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9579: sharing for indicatorGroup, indicatorGroupSet
------------------------------------------------------------
revno: 9579
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-01-22 16:07:52 +0100
message:
sharing for indicatorGroup, indicatorGroupSet
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties
--
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-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-01-22 15:07:52 +0000
@@ -32,6 +32,8 @@
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.document.Document;
+import org.hisp.dhis.indicator.IndicatorGroup;
+import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.report.Report;
import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.user.User;
@@ -84,6 +86,14 @@
SUPPORTED_TYPES.put( "dataElementGroupSet", DataElementGroupSet.class );
PUBLIC_AUTHORITIES.put( DataElementGroupSet.class, "F_DATAELEMENTGROUPSET_PUBLIC_ADD" );
PRIVATE_AUTHORITIES.put( DataElementGroupSet.class, "F_DATAELEMENTGROUPSET_PRIVATE_ADD" );
+
+ SUPPORTED_TYPES.put( "indicatorGroup", IndicatorGroup.class );
+ PUBLIC_AUTHORITIES.put( IndicatorGroup.class, "F_DATAELEMENTGROUPSET_PUBLIC_ADD" );
+ PRIVATE_AUTHORITIES.put( IndicatorGroup.class, "F_DATAELEMENTGROUPSET_PRIVATE_ADD" );
+
+ SUPPORTED_TYPES.put( "indicatorGroupSet", IndicatorGroupSet.class );
+ PUBLIC_AUTHORITIES.put( IndicatorGroupSet.class, "F_DATAELEMENTGROUPSET_PUBLIC_ADD" );
+ PRIVATE_AUTHORITIES.put( IndicatorGroupSet.class, "F_DATAELEMENTGROUPSET_PRIVATE_ADD" );
}
public static boolean isSupported( String type )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2013-01-22 15:07:52 +0000
@@ -485,9 +485,13 @@
executeSql( "UPDATE userroleauthorities SET authority='F_REPORTTABLE_PUBLIC_ADD' WHERE authority='F_REPORTTABLE_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATASET_PUBLIC_ADD' WHERE authority='F_DATASET_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATADICTIONARY_PUBLIC_ADD' WHERE authority='F_DATADICTIONARY_ADD'" );
+
executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUP_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUP_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUPSET_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUPSET_ADD'" );
+ executeSql( "UPDATE userroleauthorities SET authority='F_INDICATORGROUP_PUBLIC_ADD' WHERE authority='F_INDICATORGROUP_ADD'" );
+ executeSql( "UPDATE userroleauthorities SET authority='F_INDICATORGROUPSET_PUBLIC_ADD' WHERE authority='F_INDICATORGROUPSET_ADD'" );
+
log.info( "Tables updated" );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2013-01-22 15:07:52 +0000
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
- [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
- >
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
+ [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+ >
<hibernate-mapping>
<class name="org.hisp.dhis.indicator.IndicatorGroup" table="indicatorgroup">
@@ -19,7 +19,18 @@
<cache usage="read-write" />
<key column="indicatorgroupid" foreign-key="fk_indicatorgroupmembers_indicatorgroupid" />
<many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid"
- foreign-key="fk_indicatorgroup_indicatorid" />
+ foreign-key="fk_indicatorgroup_indicatorid" />
+ </set>
+
+ <!-- Access properties -->
+ <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_indicatorgroup_userid" />
+
+ <property name="publicAccess" length="8" />
+
+ <set name="userGroupAccesses" table="indicatorgroupusergroupaccesses">
+ <cache usage="read-write" />
+ <key column="indicatorgroupid" />
+ <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
</set>
<!-- Dynamic attribute values -->
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml 2011-11-03 01:02:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml 2013-01-22 15:07:52 +0000
@@ -3,7 +3,7 @@
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
[<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
->
+ >
<hibernate-mapping>
<class name="org.hisp.dhis.indicator.IndicatorGroupSet" table="indicatorgroupset">
@@ -14,7 +14,7 @@
<generator class="native" />
</id>
&identifiableProperties;
-
+
<property name="description" />
<property name="compulsory" />
@@ -27,5 +27,16 @@
foreign-key="fk_indicatorgroupset_indicatorgroupid" />
</list>
+ <!-- Access properties -->
+ <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_indicatorgroupset_userid" />
+
+ <property name="publicAccess" length="8" />
+
+ <set name="userGroupAccesses" table="indicatorgroupsetusergroupaccesses">
+ <cache usage="read-write" />
+ <key column="indicatorgroupsetid" />
+ <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
+ </set>
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2013-01-22 15:07:52 +0000
@@ -370,12 +370,12 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm</param>
<param name="javascripts">javascript/indicatorGroup.js</param>
- <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
+ <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
</action>
<action name="addIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.AddIndicatorGroupAction">
<result name="success" type="redirect">indicatorGroup.action</result>
- <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
+ <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
</action>
<action name="showUpdateIndicatorGroupForm" class="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction">
@@ -410,12 +410,12 @@
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicatorGroupSet.js</param>
- <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
+ <param name="anyAuthorities">F_INDICATORGROUPSET_PUBLIC_ADD, F_INDICATORGROUPSET_PRIVATE_ADD</param>
</action>
<action name="addIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.AddIndicatorGroupSetAction">
<result name="success" type="redirect">indicatorGroupSet.action</result>
- <param name="requiredAuthorities">F_INDICATORGROUPSET_ADD</param>
+ <param name="anyAuthorities">F_INDICATORGROUPSET_PUBLIC_ADD, F_INDICATORGROUPSET_PRIVATE_ADD</param>
</action>
<action name="openUpdateIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.OpenUpdateIndicatorGroupSetAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-01-22 15:07:52 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'listTable' );
@@ -22,7 +25,7 @@
</table>
<table class="listTable" id="listTable">
<col/>
- <col width="120px"/>
+ <col width="145px"/>
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
@@ -34,10 +37,33 @@
<tr id="tr${indicatorGroup.id}">
<td onclick="showIndicatorGroupDetails( $indicatorGroup.id )">$encoder.htmlEncode( $indicatorGroup.displayName )</td>
<td style="text-align:right">
- <a href="showUpdateIndicatorGroupForm.action?id=$indicatorGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- <a href="javascript:translate( 'IndicatorGroup', '$indicatorGroup.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
- <a href="javascript:removeIndicatorGroup( $indicatorGroup.id, '$encoder.jsEncode( $indicatorGroup.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+
+ #if ( $security.canManage( $indicatorGroup ) )
+ <a href="javascript:showSharingDialog('indicatorGroup', '$indicatorGroup.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ #else
+ <img src="../images/relationship-denied.png">
+ #end
+
+ #if( $security.canUpdate( $indicatorGroup ) )
+ <a href="showUpdateIndicatorGroupForm.action?id=$indicatorGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+ #else
+ <img src="../images/edit-denied.png">
+ #end
+
+ #if( $security.canUpdate( $indicatorGroup ) )
+ <a href="javascript:translate( 'IndicatorGroup', '$indicatorGroup.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+ #else
+ <img src="../images/i18n-denied.png">
+ #end
+
+ #if( $security.canDelete( $indicatorGroup ) )
+ <a href="javascript:removeIndicatorGroup( $indicatorGroup.id, '$encoder.jsEncode( $indicatorGroup.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+ #else
+ <img src="../images/delete-denied.png">
+ #end
+
<a href="javascript:showIndicatorGroupDetails( $indicatorGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+
</td>
</tr>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-01-22 15:07:52 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function() {
tableSorter( 'listTable' );
@@ -22,7 +25,7 @@
<table>
<table class="listTable" id="listTable">
<col/>
- <col width="120px"/>
+ <col width="145px"/>
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
@@ -34,10 +37,33 @@
<tr id="tr${indicatorGroupSet.id}">
<td onclick="showIndicatorGroupSetDetails( $indicatorGroupSet.id )">$encoder.htmlEncode( $indicatorGroupSet.displayName )</td>
<td style="text-align:right">
- <a href="openUpdateIndicatorGroupSet.action?id=$indicatorGroupSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- <a href="javascript:translate( 'IndicatorGroupSet', '$indicatorGroupSet.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
- <a href="javascript:deleteIndicatorGroupSet( $indicatorGroupSet.id, '$encoder.jsEncode( $indicatorGroupSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+
+ #if ( $security.canManage( $indicatorGroupSet ) )
+ <a href="javascript:showSharingDialog('indicatorGroupSet', '$indicatorGroupSet.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ #else
+ <img src="../images/relationship-denied.png">
+ #end
+
+ #if( $security.canUpdate( $indicatorGroupSet ) )
+ <a href="openUpdateIndicatorGroupSet.action?id=$indicatorGroupSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+ #else
+ <img src="../images/edit-denied.png">
+ #end
+
+ #if( $security.canUpdate( $indicatorGroupSet ) )
+ <a href="javascript:translate( 'IndicatorGroupSet', '$indicatorGroupSet.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+ #else
+ <img src="../images/i18n-denied.png">
+ #end
+
+ #if( $security.canDelete( $indicatorGroupSet ) )
+ <a href="javascript:deleteIndicatorGroupSet( $indicatorGroupSet.id, '$encoder.jsEncode( $indicatorGroupSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+ #else
+ <img src="../images/delete-denied.png">
+ #end
+
<a href="javascript:showIndicatorGroupSetDetails( $indicatorGroupSet.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+
</td>
</tr>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2013-01-22 15:07:52 +0000
@@ -69,7 +69,7 @@
F_DATAVALUE_ADD=Add Data Value
F_DATAVALUE_DELETE=Delete Data Value
F_DATAVALUE_UPDATE=Update Data Value
-F_INDICATORGROUP_ADD=Add Indicator Group
+F_INDICATORGROUP_PUBLIC_ADD=Add Public Indicator Group
F_INDICATORGROUP_DELETE=Delete Indicator Group
F_INDICATORGROUP_UPDATE=Update Indicator Group
F_INDICATORTYPE_ADD=Add Indicator Type
@@ -78,7 +78,7 @@
F_INDICATOR_ADD=Add Indicator
F_INDICATOR_DELETE=Delete Indicator
F_INDICATOR_UPDATE=Update Indicator
-F_INDICATORGROUPSET_ADD=Add Indicator Group Sets
+F_INDICATORGROUPSET_PUBLIC_ADD=Add Public Indicator Group Sets
F_INDICATORGROUPSET_DELETE=Delete Indicator Group Sets
F_INDICATORGROUPSET_UPDATE=Update Indicator Group Sets
F_ORGANISATIONUNIT_ADD=Add Organisation Unit
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties 2013-01-22 15:07:52 +0000
@@ -44,7 +44,7 @@
F_ORGANISATIONUNIT_MOVE=Mover Unidad Organizativa
show_users_by_orgUnit=Mostrar usuarios por Unidad organizativa
add=A\u00f1adir
-F_INDICATORGROUP_ADD=A\u00f1adir Grupo de Indicadores
+F_INDICATORGROUP_PUBLIC_ADD=A\u00f1adir Grupo de Indicadores
F_REPORTTABLE_DELETE=Eliminar Tabla de Informe
description=Descripci\u00f3n
F_REPORT_PUBLIC_ADD=A\u00f1adir Informe
@@ -172,7 +172,7 @@
F_SECTION_ADD=A\u00f1adir Secci\u00f3n
F_SECTION_UPDATE=Actualizar Secci\u00f3n
F_SECTION_DELETE=Eliminar Secci\u00f3n
-F_INDICATORGROUPSET_ADD=A\u00f1adir Grupo de Indicadores
+F_INDICATORGROUPSET_PUBLIC_ADD=A\u00f1adir Grupo de Indicadores
F_INDICATORGROUPSET_DELETE=Eliminar Grupo de Indicadores
F_INDICATORGROUPSET_UPDATE=Actualizar Grupo de Indicadores
F_ORGANISATIONUNITLEVEL_UPDATE=Actualizar Grupo de Unidad Organizativa
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties 2013-01-22 15:07:52 +0000
@@ -64,7 +64,7 @@
F_DATAVALUE_ADD=Ajouter valeur de donn\u00e9es
F_DATAVALUE_DELETE=Supprimer valeur de donn\u00e9es
F_DATAVALUE_UPDATE=Modifier valeur de donn\u00e9es
-F_INDICATORGROUP_ADD=Ajouter groupe d'indicateurs
+F_INDICATORGROUP_PUBLIC_ADD=Ajouter groupe d'indicateurs
F_INDICATORGROUP_DELETE=Supprimer groupe d'indicateurs
F_INDICATORGROUP_UPDATE=Modifier groupe d'indicateurs
F_INDICATORTYPE_ADD=Ajouter type d'indicateur
@@ -73,7 +73,7 @@
F_INDICATOR_ADD=Ajouter indicateur
F_INDICATOR_DELETE=Supprimer indicateur
F_INDICATOR_UPDATE=Modifier indicateur
-F_INDICATORGROUPSET_ADD=Ajouter ensemble de groupes d'indicateurs
+F_INDICATORGROUPSET_PUBLIC_ADD=Ajouter ensemble de groupes d'indicateurs
F_INDICATORGROUPSET_DELETE=Supprimer ensemble de groupes d'indicateurs
F_INDICATORGROUPSET_UPDATE=Modifier ensemble de groupes d'indicateurs
F_ORGANISATIONUNIT_ADD=Ajouter Unit\u00e9 d'Organisation
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties 2013-01-22 15:07:52 +0000
@@ -64,7 +64,7 @@
F_DATAVALUE_ADD=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
F_DATAVALUE_DELETE=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
F_DATAVALUE_UPDATE=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
-F_INDICATORGROUP_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_INDICATORGROUP_PUBLIC_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
F_INDICATORGROUP_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
F_INDICATORGROUP_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
F_INDICATORTYPE_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
@@ -73,7 +73,7 @@
F_INDICATOR_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u101e\u100a\u103a\u104b
F_INDICATOR_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
F_INDICATOR_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
-F_INDICATORGROUPSET_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_INDICATORGROUPSET_PUBLIC_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
F_INDICATORGROUPSET_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
F_INDICATORGROUPSET_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
F_ORGANISATIONUNIT_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties 2013-01-22 15:07:52 +0000
@@ -64,7 +64,7 @@
F_DATAVALUE_ADD=Adicionar Valor Dados
F_DATAVALUE_DELETE=Apagar Valor Dados
F_DATAVALUE_UPDATE=Actualizar Valor Dados
-F_INDICATORGROUP_ADD=Adicionar Grupo Indicadores
+F_INDICATORGROUP_PUBLIC_ADD=Adicionar Grupo Indicadores
F_INDICATORGROUP_DELETE=Apagar Grupo Indicadores
F_INDICATORGROUP_UPDATE=Actualizar Grupo Indicadores
F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
@@ -73,7 +73,7 @@
F_INDICATOR_ADD=Adicionar Indicador
F_INDICATOR_DELETE=Apagar Indicador
F_INDICATOR_UPDATE=Actualizar Indicador
-F_INDICATORGROUPSET_ADD=Adicionar Grupo Indicadores
+F_INDICATORGROUPSET_PUBLIC_ADD=Adicionar Grupo Indicadores
F_INDICATORGROUPSET_DELETE=Apagar Grupo Indicadores
F_INDICATORGROUPSET_UPDATE=Actualizar Grupo Indicadores
F_ORGANISATIONUNIT_ADD=Adicionar Unidade Organizacional
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties 2013-01-22 15:07:52 +0000
@@ -64,7 +64,7 @@
M_dhis-web-maintenance-organisationunit=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd \u0110\u01a1n V\u1ecb
F_ORGANISATIONUNIT_MOVE=Di chuy\u1ec3n \u0111\u01a1n v\u1ecb
show_users_by_orgUnit=Hi\u1ec3n th\u1ecb ng\u01b0\u1eddi d\u00f9ng theo \u0111\u01a1n v\u1ecb
-F_INDICATORGROUP_ADD=Th\u00eam nh\u00f3m ch\u1ec9 s\u1ed1
+F_INDICATORGROUP_PUBLIC_ADD=Th\u00eam nh\u00f3m ch\u1ec9 s\u1ed1
F_REPORTTABLE_DELETE=X\u00f3a report table
F_PATIENTATTRIBUTEVALUE_ADD=Th\u00eam gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
F_PATIENTATTRIBUTE_UPDATE=C\u1eadp nh\u1eadt thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
@@ -155,7 +155,7 @@
F_INDICATOR_ADD=Th\u00eam ch\u1ec9 s\u1ed1
F_RELATIONSHIPTYPE_DELETE=X\u00f3a lo\u1ea1i quan h\u1ec7
operations=Thao t\u00e1c
-F_INDICATORGROUPSET_ADD=Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
+F_INDICATORGROUPSET_PUBLIC_ADD=Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
details=Chi ti\u1ebft
F_REPORT_UPDATE=C\u1eadp nh\u1eadt b\u00e1o c\u00e1o
F_SQLVIEW_MANAGEMENT=Qu\u1ea3n l\u00fd Sql View
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties 2013-01-22 13:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties 2013-01-22 15:07:52 +0000
@@ -63,7 +63,7 @@
specify_surname=\u8BF7\u6CE8\u660E\u59D3
fullname=\u5168\u540D
F_INDICATOR_DELETE=\u5220\u9664\u6307\u6807
-F_INDICATORGROUPSET_ADD=\u6DFB\u52A0\u6307\u6807\u7EC4\u96C6
+F_INDICATORGROUPSET_PUBLIC_ADD=\u6DFB\u52A0\u6307\u6807\u7EC4\u96C6
M_dhis-web-visualizer=\u67E5\u770B\u6570\u636E\u53EF\u89C6\u5316\u6A21\u5757
roles=\u89D2\u8272
specify_raw_password=\u8BF7\u6CE8\u660E\u5BC6\u7801
@@ -134,7 +134,7 @@
F_CONSTANT_ADD=\u6DFB\u52A0\u5E38\u6570
email=\u7535\u5B50\u90AE\u4EF6
M_dhis-web-maintenance-dataset=\u6570\u636E\u96C6\u7EF4\u62A4
-F_INDICATORGROUP_ADD=\u6DFB\u52A0\u6307\u6807\u7EC4
+F_INDICATORGROUP_PUBLIC_ADD=\u6DFB\u52A0\u6307\u6807\u7EC4
F_DV_ADMIN=\u7BA1\u7406\u6570\u636E\u53EF\u89C6\u5316\u5DE5\u5177
F_USER_GRUP_ADD=\u6DFB\u52A0\u7528\u6237\u7EC4
F_GENERATE_BENEFICIARY_TABULAR_REPORT=\u751F\u6210\u53D7\u76CA\u4EBA\u8868\u683C\u62A5\u544A
