dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28721
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14372: added public/private authorities for sqlView, optionSet
------------------------------------------------------------
revno: 14372
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-24 20:03:18 +0100
message:
added public/private authorities for sqlView, optionSet
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
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.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.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-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 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-03-24 19:03:18 +0000
@@ -28,13 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.amplecode.quick.BatchHandler;
import org.amplecode.quick.BatchHandlerFactory;
import org.amplecode.quick.StatementHolder;
@@ -49,6 +42,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Lars Helge Overland
*/
@@ -563,6 +563,9 @@
executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_DELETE' WHERE authority='F_USER_GRUP_DELETE'" );
executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_LIST' WHERE authority='F_USER_GRUP_LIST'" );
+ executeSql( "UPDATE userroleauthorities SET authority='F_SQLVIEW_PUBLIC_ADD' WHERE authority='F_SQLVIEW_ADD'" );
+ executeSql( "UPDATE userroleauthorities SET authority='F_OPTIONSET_PUBLIC_ADD' WHERE authority='F_OPTIONSET_ADD'" );
+
// remove unused authorities
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_CONCEPT_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_CONSTANT_UPDATE'" );
@@ -635,7 +638,7 @@
executeSql( "ALTER TABLE dataelementcategory DROP COLUMN conceptid" );
executeSql( "ALTER TABLE dataelementcategoryoption DROP COLUMN conceptid" );
-
+
// upgrade system charts/maps to public read-only sharing
executeSql( "UPDATE chart SET publicaccess='r-------' WHERE user IS NULL AND publicaccess IS NULL;" );
executeSql( "UPDATE map SET publicaccess='r-------' WHERE user IS NULL AND publicaccess IS NULL;" );
@@ -704,9 +707,9 @@
private void upgradeDataValuesWithAttributeOptionCombo()
{
final String sql = statementBuilder.getNumberOfColumnsInPrimaryKey( "datavalue" );
-
+
Integer no = statementManager.getHolder().queryForInteger( sql );
-
+
if ( no >= 5 )
{
return; // attributeoptioncomboid already part of datavalue primary key
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2014-03-24 18:55:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2014-03-24 19:03:18 +0000
@@ -300,7 +300,7 @@
<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
<param name="page">/dhis-web-maintenance-dataadmin/addSqlViewForm.vm</param>
<param name="javascripts">javascript/sqlView.js, javascript/addSqlViewForm.js</param>
- <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
+ <param name="anyAuthorities">F_SQLVIEW_PUBLIC_ADD, F_SQLVIEW_PRIVATE_ADD</param>
</action>
<action name="validateAddUpdateSqlView" class="org.hisp.dhis.dataadmin.action.sqlview.ValidateAddUpdateSqlViewAction">
@@ -314,7 +314,7 @@
showSqlViewListForm.action
</result>
<result name="error" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
+ <param name="anyAuthorities">F_SQLVIEW_PUBLIC_ADD, F_SQLVIEW_PRIVATE_ADD</param>
</action>
<action name="showUpdateSqlViewForm" class="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewObjectAction">
@@ -322,13 +322,13 @@
<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
<param name="page">/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm</param>
<param name="javascripts">javascript/sqlView.js, javascript/updateSqlViewForm.js</param>
- <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
+ <param name="anyAuthorities">F_SQLVIEW_PUBLIC_ADD, F_SQLVIEW_PRIVATE_ADD</param>
</action>
<action name="updateSqlViewInstance" class="org.hisp.dhis.dataadmin.action.sqlview.UpdateSqlViewAction">
<result name="success" type="redirect">showSqlViewListForm.action</result>
<result name="error" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
+ <param name="anyAuthorities">F_SQLVIEW_PUBLIC_ADD, F_SQLVIEW_PRIVATE_ADD</param>
</action>
<action name="removeSqlViewObject" class="org.hisp.dhis.dataadmin.action.sqlview.RemoveSqlViewAction">
@@ -612,24 +612,24 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataadmin/addOptionSetForm.vm</param>
<param name="javascripts">javascript/optionSet.js</param>
- <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
+ <param name="anyAuthorities">F_OPTIONSET_PUBLIC_ADD, F_OPTIONSET_PRIVATE_ADD</param>
</action>
<action name="addOptionSet" class="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction">
<result name="success" type="redirect">optionSet.action</result>
- <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
+ <param name="anyAuthorities">F_OPTIONSET_PUBLIC_ADD, F_OPTIONSET_PRIVATE_ADD</param>
</action>
<action name="showUpdateOptionSetForm" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataadmin/updateOptionSetForm.vm</param>
<param name="javascripts">javascript/optionSet.js</param>
- <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
+ <param name="anyAuthorities">F_OPTIONSET_PUBLIC_ADD, F_OPTIONSET_PRIVATE_ADD</param>
</action>
<action name="updateOptionSet" class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction">
<result name="success" type="redirect">optionSet.action</result>
- <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
+ <param name="anyAuthorities">F_OPTIONSET_PUBLIC_ADD, F_OPTIONSET_PRIVATE_ADD</param>
</action>
<action name="removeOptionSet" class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction">
=== 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 2014-03-05 05:52:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-03-24 19:03:18 +0000
@@ -213,7 +213,8 @@
F_MAP_EXTERNAL=Map External Access
F_DATAMART_ADMIN=Administrate data mart
F_SCHEDULING_ADMIN=Scheduling Administration
-F_SQLVIEW_ADD=Add/Update Sql View
+F_SQLVIEW_PUBLIC_ADD=Add/Update Public Sql View
+F_SQLVIEW_PRIVATE_ADD=Add/Update Private Sql View
F_SQLVIEW_DELETE=Delete Sql View
F_SQLVIEW_EXECUTE=Execute Sql View
F_SQLVIEW_MANAGEMENT=Sql View Management
@@ -221,7 +222,8 @@
F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
F_SEND_MESSAGE=Send message
F_OPTIONSET_MANAGEMENT=Option Set Management
-F_OPTIONSET_ADD=Add/Update Option Set
+F_OPTIONSET_PUBLIC_ADD=Add/Update Public Option Set
+F_OPTIONSET_PRIVATE_ADD=Add/Update Private Option Set
F_OPTIONSET_DELETE=Delete Option Set
F_DATA_MART_ADMIN=Administrate data mart
F_DV_ADMIN=Administrate data vizualiser
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties 2013-10-15 10:49:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties 2014-03-24 19:03:18 +0000
@@ -202,7 +202,7 @@
F_GIS_ADMIN=Administrar SIG
F_DATAMART_ADMIN=Administrar data mart
F_SCHEDULING_ADMIN=Administraci\u00f3n de Programaci\u00f3n
-F_SQLVIEW_ADD=A\u00f1adir Vista SQL
+F_SQLVIEW_PUBLIC_ADD=A\u00f1adir Vista SQL
F_SQLVIEW_DELETE=Eliminar Vista SQL
F_SQLVIEW_EXECUTE=Ejecutar Vista SQL
F_SQLVIEW_MANAGEMENT=Administraci\u00f3n de vistas SQL
@@ -210,7 +210,7 @@
F_VALIDATIONCRITERIA_DELETE=Eliminar criterio de validaci\u00f3n
F_SEND_MESSAGE=Enviar mensaje
F_OPTIONSET_MANAGEMENT=Administraci\u00f3n de Sets de Opciones
-F_OPTIONSET_ADD=A\u00f1adir Set de Opciones
+F_OPTIONSET_PUBLIC_ADD=A\u00f1adir Set de Opciones
F_OPTIONSET_DELETE=Eliminar Set de Opciones
F_DATA_MART_ADMIN=Administrar data mart
F_DV_ADMIN=Administrar visualizador de datos
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties 2013-12-19 08:19:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties 2014-03-24 19:03:18 +0000
@@ -22,7 +22,7 @@
password_is_not_valid=Mot de passe invalide
F_METADATA_EXPORT=Exporter M\u00E9ta-Donn\u00E9es
F_REPORT_PUBLIC_ADD=Ajouter Rapport Public
-F_OPTIONSET_ADD=Ajouter le jeu d'options
+F_OPTIONSET_PUBLIC_ADD=Ajouter le jeu d'options
organisation_unit=Unit\u00E9 d'Organisation
F_PROGRAM_INDICATOR_MANAGEMENT=G\u00E9rer les indicateurs de programme
members=Membres
@@ -295,7 +295,7 @@
user_role=R\u00F4le d'utilisateur
F_ALLOW_EDIT_PATIENT_PROPERTIES=Ajouter et modifier les propri\u00E9t\u00E9s de personne
F_DATASET_PUBLIC_ADD=Ajouter ensemble de donn\u00E9es
-F_SQLVIEW_ADD=Ajouter Vue Sql
+F_SQLVIEW_PUBLIC_ADD=Ajouter Vue Sql
authorities=Autorit\u00E9s
edit_user_role=Modifier R\u00F4le d'utilisateur
F_ORGANISATIONUNIT_DELETE=Supprimer 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_id.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties 2014-03-24 19:03:18 +0000
@@ -183,7 +183,7 @@
F_MAP_PUBLIC_ADD=Tambahkan Peta Publik
F_DATAMART_ADMIN=Administrasi data mart
F_SCHEDULING_ADMIN=Menjadwalkan Administrasi
-F_SQLVIEW_ADD=Tambahkan tampilan Sql
+F_SQLVIEW_PUBLIC_ADD=Tambahkan tampilan Sql
F_SQLVIEW_DELETE=Hapus Tampilan Sql
F_SQLVIEW_EXECUTE=Jalankan tampilan Sql
F_SQLVIEW_MANAGEMENT=Manajemen tampilan Sql
@@ -191,7 +191,7 @@
F_VALIDATIONCRITERIA_DELETE=Hapus kriteria Validasi
F_SEND_MESSAGE=Kirim pesan
F_OPTIONSET_MANAGEMENT=Opsi Pengaturan Manajemen
-F_OPTIONSET_ADD=Tambahkan Opsi Set
+F_OPTIONSET_PUBLIC_ADD=Tambahkan Opsi Set
F_OPTIONSET_DELETE=Hapus Opsi Set
F_DATA_MART_ADMIN=Administrasi data mart
F_DV_ADMIN=Administrasi data vizualiser
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties 2013-12-11 13:39:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties 2014-03-24 19:03:18 +0000
@@ -200,7 +200,7 @@
F_MAP_EXTERNAL=Map External Access
F_DATAMART_ADMIN=Administrate data mart
F_SCHEDULING_ADMIN=Scheduling Administration
-F_SQLVIEW_ADD=Add/Update Sql View
+F_SQLVIEW_PUBLIC_ADD=Add/Update Sql View
F_SQLVIEW_DELETE=Delete Sql View
F_SQLVIEW_EXECUTE=Execute Sql View
F_SQLVIEW_MANAGEMENT=Sql View Management
@@ -208,7 +208,7 @@
F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
F_SEND_MESSAGE=Send message
F_OPTIONSET_MANAGEMENT=Option Set Management
-F_OPTIONSET_ADD=Add/Update Option Set
+F_OPTIONSET_PUBLIC_ADD=Add/Update Option Set
F_OPTIONSET_DELETE=Delete Option Set
F_DATA_MART_ADMIN=Administrate data mart
F_DV_ADMIN=Administrate data vizualiser
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties 2014-03-24 19:03:18 +0000
@@ -139,7 +139,7 @@
F_GIS_ADMIN=GIS \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u101e\u100a\u103a\u104b
F_DATAMART_ADMIN=data mart \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u101e\u100a\u103a\u104b
F_SCHEDULING_ADMIN=Scheduling Administration
-F_SQLVIEW_ADD=Sql view \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
+F_SQLVIEW_PUBLIC_ADD=Sql view \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
F_SQLVIEW_DELETE=Sql view \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
F_SQLVIEW_EXECUTE=Sql view \u1000\u102d\u102f \u1006\u1031\u102c\u1004\u103a\u101b\u103d\u1000\u103a\u1015\u102b\u104b
F_SQLVIEW_MANAGEMENT=Sql view \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103c\u1004\u103a\u1038
@@ -147,7 +147,7 @@
F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
F_SEND_MESSAGE=messagae \u1015\u102d\u102f\u1037\u1015\u102b\u104b
F_OPTIONSET_MANAGEMENT=Option set management
-F_OPTIONSET_ADD=Option set \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
+F_OPTIONSET_PUBLIC_ADD=Option set \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
F_OPTIONSET_DELETE=Option set \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
F_DATA_MART_ADMIN=data mart \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u1015\u102b\u104b
F_DV_ADMIN=Administrate data vizualiser
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties 2013-12-01 20:40:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties 2014-03-24 19:03:18 +0000
@@ -23,7 +23,7 @@
password_is_not_valid=Password inv\u00E1lida
F_METADATA_EXPORT=Exportar Meta-Dados
F_REPORT_PUBLIC_ADD=Adicionar Relat\u00F3rio
-F_OPTIONSET_ADD=Adicionar Conjunto de Op\u00E7\u00E3o
+F_OPTIONSET_PUBLIC_ADD=Adicionar Conjunto de Op\u00E7\u00E3o
organisation_unit=Unidade Organizacional
F_PROGRAM_INDICATOR_MANAGEMENT=Gerir indicadores de programa
members=Membros
@@ -309,7 +309,7 @@
F_ALLOW_EDIT_PATIENT_PROPERTIES=Adicionar / Alterar propriedades de pessoas
F_DATASET_PUBLIC_ADD=Adicionar Ficha
F_REPORT_ADD=Adicionar Relat\u00F3rio
-F_SQLVIEW_ADD=Adicionar Vista SQL
+F_SQLVIEW_PUBLIC_ADD=Adicionar Vista SQL
authorities=Autoridades
edit_user_role=Actualizar fun\u00E7\u00F5es do utilizador
F_ORGANISATIONUNIT_DELETE=Apagar Unidade Organizacional
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties 2014-03-24 19:03:18 +0000
@@ -23,7 +23,7 @@
password_is_not_valid=Password inv\u00E1lida
F_METADATA_EXPORT=Exportar Meta-Dados
F_REPORT_PUBLIC_ADD=Adicionar Relat\u00F3rio
-F_OPTIONSET_ADD=Adicionar Conjunto de Op\u00E7\u00E3o
+F_OPTIONSET_PUBLIC_ADD=Adicionar Conjunto de Op\u00E7\u00E3o
organisation_unit=Unidade Organizacional
members=Membros
M_dhis-web-dataentry-national=Ver m\u00F3dulo de Entrada de Dados em Listagem em Linha
@@ -288,7 +288,7 @@
F_DATASET_LOCK=Conjunto de Dados Bloqueado
saving_user_failed=Falha na grava\u00E7\u00E3o de utilizador
user_role=Fun\u00E7\u00E3o/Papel do Usu\u00E1rio
-F_SQLVIEW_ADD=Adiccionar Vista SQL
+F_SQLVIEW_PUBLIC_ADD=Adiccionar Vista SQL
F_REPORT_ADD=Adicionar Relat\u00F3rio
F_DATASET_PUBLIC_ADD=Adicionar Conjunto de Dados
authorities=Autoridades
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties 2014-03-24 19:03:18 +0000
@@ -202,7 +202,7 @@
F_MAP_EXTERNAL = \u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0434\u043E\u0441\u0442\u0443\u043F \u043A \u043A\u0430\u0440\u0442\u0435
F_DATAMART_ADMIN = \u0412\u0438\u0442\u0440\u0438\u043D\u0430 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
F_SCHEDULING_ADMIN = \u041F\u043B\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
-F_SQLVIEW_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 Sql
+F_SQLVIEW_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 Sql
F_SQLVIEW_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 Sql
F_SQLVIEW_EXECUTE = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 Sql
F_SQLVIEW_MANAGEMENT = \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u043E\u043C Sql
@@ -210,7 +210,7 @@
F_VALIDATIONCRITERIA_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
F_SEND_MESSAGE = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435
F_OPTIONSET_MANAGEMENT = \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430\u0431\u043E\u0440\u043E\u043C \u043E\u043F\u0446\u0438\u0439
-F_OPTIONSET_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u043E\u043F\u0446\u0438\u0439
+F_OPTIONSET_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u043E\u043F\u0446\u0438\u0439
F_OPTIONSET_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u043E\u043F\u0446\u0438\u0439
F_DATA_MART_ADMIN = \u0412\u0438\u0442\u0440\u0438\u043D\u0430 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
F_DV_ADMIN = \u0412\u0438\u0437\u0443\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties 2014-03-24 19:03:18 +0000
@@ -202,7 +202,7 @@
F_MAP_EXTERNAL = \u0414\u0430\u0441\u0442\u0440\u0430\u0441\u0438\u0438 \u0431\u0435\u0440\u0443\u043D\u0430 \u0431\u0430 \u0445\u0430\u0440\u0438\u0442\u0430
F_DATAMART_ADMIN = \u041C\u0430\u044A\u043C\u0443\u0440\u0438\u044F\u0442\u0438 \u043A\u0438\u043E\u0441\u043A\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442
F_SCHEDULING_ADMIN = \u041C\u0430\u044A\u043C\u0443\u0440\u0438\u044F\u0442\u0438 \u0431\u0430\u043D\u0430\u049B\u0448\u0430\u0433\u0438\u0440\u04E3
-F_SQLVIEW_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 Sql View
+F_SQLVIEW_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 Sql View
F_SQLVIEW_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u043D\u0430\u043C\u0443\u0434\u0438 Sql
F_SQLVIEW_EXECUTE = \u0418\u04B7\u0440\u043E\u0438\u0448\u0438 \u043D\u0430\u043C\u0443\u0434\u0438 Sql
F_SQLVIEW_MANAGEMENT = \u0418\u0434\u043E\u0440\u0430\u043A\u0443\u043D\u0438\u0438 \u043D\u0430\u043C\u0443\u0434\u0438 Sql
@@ -210,7 +210,7 @@
F_VALIDATIONCRITERIA_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u043C\u0435\u044A\u0451\u0440\u04B3\u043E\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
F_SEND_MESSAGE = \u0424\u0438\u0440\u0438\u0441\u0442\u043E\u0434\u0430\u043D\u0438 \u043F\u0430\u0451\u043C
F_OPTIONSET_MANAGEMENT = \u0418\u0434\u043E\u0440\u0430\u043A\u0443\u043D\u0438\u0438 \u043C\u0430\u04B7\u043C\u04EF\u0438 \u0438\u043C\u043A\u043E\u043D\u043E\u0442
-F_OPTIONSET_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u043C\u0430\u04B7\u043C\u04EF\u0438 \u0438\u043C\u043A\u043E\u043D\u043E\u0442
+F_OPTIONSET_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u043C\u0430\u04B7\u043C\u04EF\u0438 \u0438\u043C\u043A\u043E\u043D\u043E\u0442
F_OPTIONSET_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u043C\u0430\u04B7\u043C\u04EF\u0438 \u0438\u043C\u043A\u043E\u043D\u043E\u0442
F_DATA_MART_ADMIN = \u041C\u0430\u044A\u043C\u0443\u0440\u0438\u044F\u0442\u0438 \u043A\u0438\u043E\u0441\u043A\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442
F_DV_ADMIN = \u041C\u0430\u044A\u043C\u0443\u0440\u0438\u044F\u0442\u0438 \u043D\u0430\u043C\u043E\u0438\u0448\u0433\u0430\u0440\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties 2014-03-24 19:03:18 +0000
@@ -113,7 +113,7 @@
F_ORGANISATION_REGISTRATION=\u0110\u0103ng k\u00fd \u0111\u01a1n v\u1ecb s\u1eed d\u1ee5ng \u0111\u1ed1i t\u01b0\u1ee3ng
F_PATIENTATTRIBUTE_ADD=Th\u00eam thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
create_new_user=T\u1ea1o t\u00e0i kho\u1ea3n m\u1edbi
-F_SQLVIEW_ADD=Th\u00eam Sql View
+F_SQLVIEW_PUBLIC_ADD=Th\u00eam Sql View
password=M\u1eadt kh\u1ea9u
F_DATADICTIONARY_PUBLIC_ADD=Th\u00eam t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
select_role=Ch\u1ecdn ph\u00e2n quy\u1ec1n
@@ -234,7 +234,7 @@
F_REPORTTABLE_PUBLIC_ADD=Th\u00eam report table
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
-F_OPTIONSET_ADD=Th\u00eam t\u1eadp t\u00f9y ch\u1ecdn
+F_OPTIONSET_PUBLIC_ADD=Th\u00eam t\u1eadp t\u00f9y ch\u1ecdn
F_OPTIONSET_DELETE=X\u00f3a t\u1eadp t\u00f9y ch\u1ecdn
F_DATA_MART_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
F_DV_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u hi\u1ec3n th\u1ecb
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties 2014-03-24 19:03:18 +0000
@@ -15,7 +15,7 @@
F_VALIDATIONRULE_DELETE=\u5220\u9664\u9A8C\u8BC1\u89C4\u5219
M_dhis-web-maintenance-dataadmin=\u6570\u636E\u7BA1\u7406\u7EF4\u62A4
password_is_not_valid=\u5BC6\u7801\u4E0D\u53EF\u7528
-F_OPTIONSET_ADD=\u6DFB\u52A0\u9009\u9879\u96C6
+F_OPTIONSET_PUBLIC_ADD=\u6DFB\u52A0\u9009\u9879\u96C6
organisation_unit=\u7EC4\u7EC7\u673A\u6784
surname=\u59D3\u6C0F
members=\u6210\u5458
@@ -234,7 +234,7 @@
F_DATASET_LOCK=\u9501\u5B9A\u6570\u636E\u96C6
saving_user_failed=\u4FDD\u5B58\u7528\u6237\u5931\u8D25
user_role=\u7528\u6237\u89D2\u8272
-F_SQLVIEW_ADD=\u6DFB\u52A0SQL\u89C6\u56FE
+F_SQLVIEW_PUBLIC_ADD=\u6DFB\u52A0SQL\u89C6\u56FE
F_REPORT_PUBLIC_ADD=\u6DFB\u52A0\u62A5\u8868
authorities=\u6743\u9650
edit_user_role=\u7F16\u8F91\u7528\u6237\u89D2\u8272
