=== 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-08 16:31:45 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-01-17 15:00:33 +0000
@@ -27,6 +27,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import org.amplecode.quick.StatementHolder;
+import org.amplecode.quick.StatementManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hisp.dhis.system.startup.AbstractStartupRoutine;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -34,14 +41,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.amplecode.quick.StatementHolder;
-import org.amplecode.quick.StatementManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.common.AccessStringHelper;
-import org.hisp.dhis.system.startup.AbstractStartupRoutine;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @author Lars Helge Overland
  */
@@ -254,10 +253,10 @@
         executeSql( "UPDATE patientattribute set inheritable=false where inheritable is null" );
         executeSql( "UPDATE dataelement SET numbertype='number' where numbertype is null and valuetype='int'" );
 
-       // revert prepare aggregate*Value tables for offline diffs
+        // revert prepare aggregate*Value tables for offline diffs
 
-        executeSql( "ALTER TABLE aggregateddatavalue DROP COLUMN modified");
-        executeSql( "ALTER TABLE aggregatedindicatorvalue DROP COLUMN modified ");
+        executeSql( "ALTER TABLE aggregateddatavalue DROP COLUMN modified" );
+        executeSql( "ALTER TABLE aggregatedindicatorvalue DROP COLUMN modified " );
         executeSql( "UPDATE indicatortype SET indicatornumber=false WHERE indicatornumber is null" );
 
         // program
@@ -418,7 +417,7 @@
         executeSql( "update reporttable set lastsixmonth = false where lastsixmonth is null" );
         executeSql( "update reporttable set last4quarters = false where last4quarters is null" );
         executeSql( "update reporttable set last12months = false where last12months is null" );
-	executeSql( "update reporttable set last3months = false where last3months is null" );
+        executeSql( "update reporttable set last3months = false where last3months is null" );
         executeSql( "update reporttable set last6bimonths = false where last6bimonths is null" );
         executeSql( "update reporttable set last4quarters = false where last4quarters is null" );
         executeSql( "update reporttable set last2sixmonths = false where last2sixmonths is null" );
@@ -451,7 +450,7 @@
         executeSql( "update users set selfregistered = false where selfregistered is null" );
         executeSql( "update users set disabled = false where disabled is null" );
         executeSql( "update dataentryform set format = 1 where format is null" );
-        
+
         // report, reporttable, chart groups
 
         executeSql( "DROP TABLE reportgroupmembers" );
@@ -479,13 +478,11 @@
         executeSql( "ALTER TABLE dataset ALTER COLUMN shortname TYPE character varying(50)" );
         executeSql( "ALTER TABLE organisationunit ALTER COLUMN shortname TYPE character varying(50)" );
 
-        // set default access properties
-        String publicString = AccessStringHelper.newInstance()
-            .enable( AccessStringHelper.Permission.READ )
-            .enable( AccessStringHelper.Permission.WRITE )
-            .build();
+        // upgrade authorities
 
-        // executeSql( "UPDATE document SET publicaccess = '" + publicString + "' WHERE userid IS NULL AND publicaccess IS NULL" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_DOCUMENT_PUBLIC_ADD' WHERE authority='F_DOCUMENT_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_REPORT_PUBLIC_ADD' WHERE authority='F_REPORT_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_REPORTTABLE_PUBLIC_ADD' WHERE authority='F_REPORTTABLE_ADD'" );
 
         log.info( "Tables updated" );
     }

=== 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	2012-12-14 05:49:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-01-17 15:00:33 +0000
@@ -91,8 +91,6 @@
 F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
 F_ORGUNITGROUPSET_UPDATE=Update Organisation Unit Group Set
 F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
-F_REPORT_ADD=Add Report
-F_REPORT_DELETE=Delete Report
 F_REPORT_UPDATE=Update Report
 F_USERROLE_ADD=Add User Role
 F_USERROLE_DELETE=Delete User Role
@@ -113,14 +111,17 @@
 F_VALIDATIONRULEGROUP_UPDATE=Update Validation Rule Group
 F_VALIDATIONRULEGROUP_DELETE=Delete Validation Rule Group
 F_GIS_CONFIGURATION_UPDATE=Change GIS Configuration
-F_REPORT_ADD=Add Report
+F_REPORT_PUBLIC_ADD=Add Public Report
+F_REPORT_PRIVATE_ADD=Add Private Report
 F_REPORT_DELETE=Delete Report
-F_REPORTTABLE_ADD=Add Report Table
+F_REPORTTABLE_PUBLIC_ADD=Add Public Report Table
+F_REPORTTABLE_PRIVATE_ADD=Add Private Report Table
 F_REPORTTABLE_DELETE=Delete Report Table
 F_REPORT_VIEW=View Report
 F_CHART_ADD=Add Chart
 F_CHART_DELETE=Delete Chart
-F_DOCUMENT_ADD=Add Document
+F_DOCUMENT_PUBLIC_ADD=Add Public Document
+F_DOCUMENT_PRIVATE_ADD=Add Private Document
 F_DOCUMENT_DELETE=Delete Document
 F_DASHBOARD_DOWNLOAD_BACKUP=Create and download backup
 F_EXCEL_REPORT_ADMINISTRATION=Excel Reporting Administration

=== 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	2012-12-19 12:31:08 +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-17 15:00:33 +0000
@@ -47,10 +47,10 @@
 F_INDICATORGROUP_ADD=A\u00f1adir Grupo de Indicadores
 F_REPORTTABLE_DELETE=Eliminar Tabla de Informe
 description=Descripci\u00f3n
-F_REPORT_ADD=A\u00f1adir Informe
+F_REPORT_PUBLIC_ADD=A\u00f1adir Informe
 user=Usuario
 name_in_use=El nombre ya esta en uso, por favor, seleccione un nombre diferente
-F_DOCUMENT_ADD=A\u00f1adir Documento
+F_DOCUMENT_PUBLIC_ADD=A\u00f1adir Documento
 confirm_delete_user=\u00bfConfirmar suprimir a este usuario?
 M_dhis-web-maintenance-dataset=Ver m\u00f3dulo de mantenimiento de Conjunto de Datos
 F_ORGUNITGROUPSET_ADD=A\u00f1adir Conjunto de Grupos de Unidad Organizativa
@@ -146,7 +146,7 @@
 F_DATAVALUE_ADD=A\u00f1adir Valor de Dato
 F_ORGUNITGROUPSET_DELETE=Eliminar Conjunto de Grupos de Unidad Organizativa
 email=Correo electronico
-F_REPORTTABLE_ADD=A\u00f1adir Tabla de Informe
+F_REPORTTABLE_PUBLIC_ADD=A\u00f1adir Tabla de Informe
 M_dhis-web-api=Ver m\u00f3dulo API
 M_dhis-web-exportdatamart=Ver m\u00f3dulo de Exportaci\u00f3n Data Mart
 M_dhis-web-excel-reporting=Ver m\u00f3dulo de Reporte Excel

=== 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	2012-03-08 08:08:46 +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-17 15:00:33 +0000
@@ -87,7 +87,6 @@
 F_ORGUNITGROUPSET_DELETE=Supprimer ensemble de groupes d'unit\u00e9s d'organisation
 F_ORGUNITGROUPSET_UPDATE=Modifier ensemble de groupes d'unit\u00e9s d'organisation
 F_ORGANISATIONUNITLEVEL_UPDATE=Modifier niveau d'unit\u00e9 d'organisation
-F_REPORT_ADD=Ajouter rapport
 F_REPORT_DELETE=Supprimer rapport
 F_REPORT_UPDATE=Modifier rapport
 F_USERROLE_ADD=Ajouter r\u00f4le d'utilisateur
@@ -108,14 +107,14 @@
 F_VALIDATIONRULEGROUP_UPDATE=Modifier groupe de r\u00e8gles de validation
 F_VALIDATIONRULEGROUP_DELETE=Supprimer groupe de r\u00e8gles de validation
 F_GIS_CONFIGURATION_UPDATE=Changer la configuration SIG
-F_REPORT_ADD=Ajouter rapport
+F_REPORT_PUBLIC_ADD=Ajouter rapport
 F_REPORT_DELETE=Supprimer rapport
-F_REPORTTABLE_ADD=Ajouter tableau de rapport
+F_REPORTTABLE_PUBLIC_ADD=Ajouter tableau de rapport
 F_REPORTTABLE_DELETE=Supprimer tableau de rapport
 F_REPORT_VIEW=Afficher rapport
 F_CHART_ADD=Ajouter graphique
 F_CHART_DELETE=Supprimer graphique
-F_DOCUMENT_ADD=Ajouter document
+F_DOCUMENT_PUBLIC_ADD=Ajouter document
 F_DOCUMENT_DELETE=Supprimer document
 F_DASHBOARD_DOWNLOAD_BACKUP=Cr\u00e9er et t\u00e9l\u00e9charger une sauvegarde
 F_EXCEL_REPORT_ADMINISTRATION=Administration des rapports tableur

=== 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	2012-04-06 09:52:26 +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-17 15:00:33 +0000
@@ -87,7 +87,6 @@
 F_ORGUNITGROUPSET_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_ORGUNITGROUPSET_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNITLEVEL_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1006\u1004\u1037\u103a \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
-F_REPORT_ADD=Add Report
 F_REPORT_DELETE=Delete Report
 F_REPORT_UPDATE=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_USERROLE_ADD=Add User Role
@@ -108,14 +107,14 @@
 F_VALIDATIONRULEGROUP_UPDATE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_VALIDATIONRULEGROUP_DELETE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_GIS_CONFIGURATION_UPDATE=GIS \u1015\u102f\u1036\u1005\u1036 \u1015\u103c\u1031\u102c\u1004\u103a\u1038\u101e\u100a\u103a\u104b
-F_REPORT_ADD=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_REPORT_PUBLIC_ADD=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_REPORT_DELETE=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_REPORTTABLE_ADD=Report Table \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_REPORTTABLE_PUBLIC_ADD=Report Table \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_REPORTTABLE_DELETE=Report Table \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_REPORT_VIEW=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1000\u103c\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_CHART_ADD=Chart \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_CHART_DELETE=Chart \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_DOCUMENT_ADD=Document \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_DOCUMENT_PUBLIC_ADD=Document \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DOCUMENT_DELETE=Document \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_DASHBOARD_DOWNLOAD_BACKUP=backup \u1010\u1005\u103a\u1001\u102f\u1016\u1014\u103a\u1010\u102e\u1038\u1015\u103c\u102e\u1038 download \u1006\u103d\u1032\u1001\u103b\u1015\u102b\u104b
 F_EXCEL_REPORT_ADMINISTRATION=Excel Reporting Administration

=== 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	2012-04-25 14:59:29 +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-17 15:00:33 +0000
@@ -87,7 +87,6 @@
 F_ORGUNITGROUPSET_DELETE=Apagar Set Grupo de Unidade Organizacional
 F_ORGUNITGROUPSET_UPDATE=Actualizar Set Grupo Unidade Organizacional
 F_ORGANISATIONUNITLEVEL_UPDATE=Actualizar Grupo Unidade Organizacional
-F_REPORT_ADD=Adicionar Relat\u00f3rio
 F_REPORT_DELETE=Apagar Relat\u00f3rio
 F_REPORT_UPDATE=Actualizar Relat\u00f3rio
 F_USERROLE_ADD=Adicionar Papel do Usu\u00e1rio
@@ -108,14 +107,14 @@
 F_VALIDATIONRULEGROUP_UPDATE=Actualizar grupo de regra de valida\u00e7\u00e3o
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00e7\u00e3o
 F_GIS_CONFIGURATION_UPDATE=Mudar Configura\u00e7\u00e3o GIS
-F_REPORT_ADD=Adicionar Relat\u00f3rio
+F_REPORT_PUBLIC_ADD=Adicionar Relat\u00f3rio
 F_REPORT_DELETE=Apagar Relat\u00f3rio
-F_REPORTTABLE_ADD=Adicionar Tabela de Relat\u00f3rios
+F_REPORTTABLE_PUBLIC_ADD=Adicionar Tabela de Relat\u00f3rios
 F_REPORTTABLE_DELETE=Apagar Tabela Relat\u00f3rios
 F_REPORT_VIEW=Ver Relat\u00f3rio
 F_CHART_ADD=Adicionar Gr\u00e1fico
 F_CHART_DELETE=Apagar Gr\u00e1fico
-F_DOCUMENT_ADD=Adiccionar Documento
+F_DOCUMENT_PUBLIC_ADD=Adiccionar Documento
 F_DOCUMENT_DELETE=Eliminar Documento
 F_DASHBOARD_DOWNLOAD_BACKUP=Criar e transferir c\u00f3pia de seguran\u00e7a
 F_EXCEL_REPORT_ADMINISTRATION=Administra\u00e7\u00e3o de Relat\u00f3rio em Excel

=== 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	2012-03-08 08:28:22 +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-17 15:00:33 +0000
@@ -74,11 +74,11 @@
 F_PROGRAM_ATTRIBUTE_DELETE=X\u00f3a Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 M_dhis-web-caseentry=Xem ch\u1ee9c n\u0103ng Nh\u1eadp D\u1eef Lli\u1ec7u
 F_USER_GRUP_ADD=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
-F_REPORT_ADD=Th\u00eam b\u00e1o c\u00e1o
+F_REPORT_PUBLIC_ADD=Th\u00eam b\u00e1o c\u00e1o
 user=T\u00ean ng\u01b0\u1eddi d\u00f9ng
 name_in_use=T\u00ean n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng, h\u00e3y x\u00e1c \u0111\u1ecbnh m\u1ed9t t\u00ean kh\u00e1c
 dataSets=C\u00e1c t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
-F_DOCUMENT_ADD=Th\u00eam t\u00e0i li\u1ec7u
+F_DOCUMENT_PUBLIC_ADD=Th\u00eam t\u00e0i li\u1ec7u
 confirm_delete_user=B\u1ea1n c\u00f3 mu\u1ed1n x\u00f3a t\u00e0i kho\u1ea3n n\u00e0y?
 F_SQLVIEW_EXECUTE=Th\u1ef1c thi Sql View
 M_dhis-web-maintenance-dataset=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd Bi\u1ec3u Nh\u1eadp
@@ -261,7 +261,7 @@
 excel_importing=\u0110\u01b0a v\u00e0o d\u1eef li\u1ec7u (t\u1eeb file Excel)
 add_user_group=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 organisation_units=C\u00e1c \u0111\u01a1n v\u1ecb
-F_REPORTTABLE_ADD=Th\u00eam report table
+F_REPORTTABLE_PUBLIC_ADD=Th\u00eam report table
 F_SECTION_UPDATE=C\u1eadp nh\u1eadt m\u1ee5c
 M_dhis-web-maintenance-mobile=Xem ch\u1ee9c n\u0103ng B\u1ea3o Tr\u00ec v\u1edbi Di \u0110\u1ed9ng
 F_OPTIONSET_MANAGEMENT=Qu\u1ea3n tr\u1ecb t\u1eadp t\u00f9y ch\u1ecdn

=== 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	2012-09-24 17:36:50 +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-17 15:00:33 +0000
@@ -153,7 +153,7 @@
 remove=\u79FB\u9664
 retype_password=\u8F93\u5165\u5BC6\u7801
 F_USER_DELETE=\u5220\u9664\u7528\u6237
-F_DOCUMENT_ADD=\u6DFB\u52A0\u6587\u6863
+F_DOCUMENT_PUBLIC_ADD=\u6DFB\u52A0\u6587\u6863
 F_VALIDATIONCRITERIA_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u6807\u51C6
 F_DATASET_UPDATE=\u66F4\u65B0\u6570\u636E\u96C6
 F_DATAELEMENTGROUP_UPDATE=\u66F4\u65B0\u6570\u636E\u5143\u7EC4
@@ -212,7 +212,7 @@
 data_sets=\u6570\u636E\u96C6
 F_SQLVIEW_EXECUTE=\u6267\u884CSQL\u89C6\u56FE
 create_new_user=\u521B\u9020\u65B0\u7684\u7528\u6237
-F_REPORTTABLE_ADD=\u6DFB\u52A0\u62A5\u8868\u8868
+F_REPORTTABLE_PUBLIC_ADD=\u6DFB\u52A0\u62A5\u8868\u8868
 M_dhis-web-reports=NRHM\u62A5\u8868\u6A21\u5757
 M_dhis-web-exportdatamart=\u5BFC\u51FA\u6570\u636E\u96C6\u5408
 clear=\u6E05\u9664
@@ -266,7 +266,7 @@
 saving_user_failed=\u4FDD\u5B58\u7528\u6237\u5931\u8D25
 user_role=\u7528\u6237\u89D2\u8272
 F_SQLVIEW_ADD=\u6DFB\u52A0SQL\u89C6\u56FE
-F_REPORT_ADD=\u6DFB\u52A0\u62A5\u8868
+F_REPORT_PUBLIC_ADD=\u6DFB\u52A0\u62A5\u8868
 authorities=\u6743\u9650
 edit_user_role=\u7F16\u8F91\u7528\u6237\u89D2\u8272
 F_ORGANISATIONUNIT_DELETE=\u5220\u9664\u7EC4\u7EC7\u673A\u6784

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2013-01-17 13:32:15 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2013-01-17 15:00:33 +0000
@@ -19,7 +19,6 @@
     <action name="saveDocument" class="org.hisp.dhis.reporting.document.action.SaveDocumentAction">
       <result name="success" type="redirect">displayViewDocumentForm.action</result>
       <interceptor-ref name="fileUploadStack" />
-      <param name="requiredAuthorities">F_DOCUMENT_ADD</param>
       <param name="anyAuthorities">F_DOCUMENT_PUBLIC_ADD,F_DOCUMENT_PRIVATE_ADD</param>
     </action>
 
@@ -41,7 +40,7 @@
       <param name="page">/dhis-web-reporting/addDocumentForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/document.js</param>
-      <param name="requiredAuthorities">F_DOCUMENT_ADD</param>
+      <param name="anyAuthorities">F_DOCUMENT_PUBLIC_ADD,F_DOCUMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="validateDocument" class="org.hisp.dhis.reporting.document.action.ValidateDocumentAction">
@@ -72,14 +71,14 @@
       <param name="page">/dhis-web-reporting/addReportForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/report.js</param>
-      <param name="requiredAuthorities">F_REPORT_ADD</param>
+      <param name="anyAuthorities">F_REPORT_PUBLIC_ADD,F_REPORT_PRIVATE_ADD</param>
     </action>
 
     <action name="addReport" class="org.hisp.dhis.reporting.reportviewer.action.AddReportAction">
       <result name="success" type="redirect">displayViewReportForm.action</result>
       <result name="error" type="redirect">displayAddReportForm.action</result>
       <interceptor-ref name="fileUploadStack" />
-      <param name="requiredAuthorities">F_REPORT_ADD</param>
+      <param name="anyAuthorities">F_REPORT_PUBLIC_ADD,F_REPORT_PRIVATE_ADD</param>
     </action>
 
     <action name="removeReport" class="org.hisp.dhis.reporting.reportviewer.action.RemoveReportAction">
@@ -146,7 +145,7 @@
 
     <action name="saveTable" class="org.hisp.dhis.reporting.tablecreator.action.SaveTableAction">
       <result name="success" type="redirect">displayManageTableForm.action</result>
-      <param name="requiredAuthorities">F_REPORTTABLE_ADD</param>
+      <param name="anyAuthorities">F_REPORTTABLE_PUBLIC_ADD,F_REPORTTABLE_PRIVATE_ADD</param>
     </action>
 
     <action name="getReportParams" class="org.hisp.dhis.reporting.tablecreator.action.GetReportParamsAction">
@@ -161,7 +160,7 @@
       <param name="page">/dhis-web-reporting/addTableForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/table.js,javascript/lists.js</param>
-      <param name="requiredAuthorities">F_REPORTTABLE_ADD</param>
+      <param name="anyAuthorities">F_REPORTTABLE_PUBLIC_ADD,F_REPORTTABLE_PRIVATE_ADD</param>
     </action>
 
     <action name="getTable" class="org.hisp.dhis.reporting.tablecreator.action.GetTableAction">