dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31487
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16048: I18n
------------------------------------------------------------
revno: 16048
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-09 11:08:45 +0200
message:
I18n
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.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-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java 2014-07-09 08:10:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java 2014-07-09 09:08:45 +0000
@@ -77,8 +77,8 @@
writer.write( content );
}
- @PreAuthorize( "hasRole('ALL')" )
@RequestMapping( value = "/script", method = RequestMethod.POST, consumes = "application/javascript" )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_INSERT_CUSTOM_JS_CSS')" )
public void postCustomScript( @RequestBody String content, HttpServletResponse response )
{
if ( content != null )
@@ -88,8 +88,8 @@
}
}
- @PreAuthorize( "hasRole('ALL')" )
@RequestMapping( value = "/script", method = RequestMethod.DELETE )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_INSERT_CUSTOM_JS_CSS')" )
public void removeCustomScript( HttpServletResponse response )
{
systemSettingManager.deleteSystemSetting( KEY_CUSTOM_JS );
@@ -110,8 +110,8 @@
writer.write( content );
}
- @PreAuthorize( "hasRole('ALL')" )
@RequestMapping( value = "/style", method = RequestMethod.POST, consumes = "text/css" )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_INSERT_CUSTOM_JS_CSS')" )
public void postCustomStyle( @RequestBody String content, HttpServletResponse response )
{
if ( content != null )
@@ -121,8 +121,8 @@
}
}
- @PreAuthorize( "hasRole('ALL')" )
@RequestMapping( value = "/style", method = RequestMethod.DELETE )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_INSERT_CUSTOM_JS_CSS')" )
public void removeCustomStyle( HttpServletResponse response )
{
systemSettingManager.deleteSystemSetting( KEY_CUSTOM_CSS );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2014-06-01 11:35:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2014-07-09 09:08:45 +0000
@@ -80,7 +80,7 @@
categoryService.updateAllOptionCombos();
}
- @RequestMapping( value = "/cacheClearing", method = { RequestMethod.PUT, RequestMethod.POST } )
+ @RequestMapping( value = "/cache", method = { RequestMethod.PUT, RequestMethod.POST } )
@PreAuthorize( "hasRole('ALL') or hasRole('F_PERFORM_MAINTENANCE')" )
public void clearCache()
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-07-09 07:48:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-07-09 09:08:45 +0000
@@ -293,6 +293,7 @@
<value>F_APPROVE_DATA</value>
<value>F_APPROVE_DATA_LOWER_LEVELS</value>
<value>F_ACCEPT_DATA_LOWER_LEVELS</value>
+ <value>F_INSERT_CUSTOM_JS_CSS</value>
</set>
</property>
</bean>
=== 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-06-25 03:57:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-07-09 09:08:45 +0000
@@ -19,7 +19,7 @@
M_dhis-web-reporting=See Report module
M_dhis-web-dashboard-integration=See Dashboard integration module
M_dhis-web-dashboard=See Dashboard module
-M_dhis-web-dataentry-national=See Linelisting DataEntry module
+M_dhis-web-dataentry-national=See Line-listing DataEntry module
M_dhis-web-reports=See NRHM Reports module
M_dhis-web-validationrule-local-in=See Validation Analysis module
M_dhis-web-excel-reporting=See Excel Report module
@@ -200,7 +200,7 @@
F_SINGLE_EVENT_DATA_ENTRY = Single Event With Registration Data Entry
F_ANONYMOUS_DATA_ENTRY = Single Event Without Registration Data Entry
F_PROGRAM_ENROLLMENT = Program Enrollment
-F_PROGRAM_UNENROLLMENT = Program Un-Enrollment
+F_PROGRAM_UNENROLLMENT = Program Un-enrollment
F_PROGRAM_STAGE_INSTANCE_DELETE = Delete Tracked Entity Instance Visit
F_PROGRAM_STAGE_INSTANCE_REMINDER = Load event reminder messages
F_PROGRAM_TRACKING_SEARCH = Search events with registration
@@ -220,10 +220,10 @@
F_MAP_EXTERNAL=Map External Access
F_DATAMART_ADMIN=Administrate data mart
F_SCHEDULING_ADMIN=Scheduling Administration
-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_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
F_VALIDATIONCRITERIA_ADD=Add/Update Validation Criteria
F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
@@ -264,11 +264,12 @@
F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT=Manage Tracked Entity Instance Reminders
F_TRACKED_ENTITY_MANAGEMENT=Manage Tracked Entities
F_TRACKED_ENTITY_ADD=Add Tracked Entities
-F_TRACKED_ENTITY_UPDATE = Update Tracked Entities
-F_VALIDATIONRULEGROUP_ADD = Add Validation Rule Groups
-F_SQLVIEW_ADD = Add Sql View
-F_ORGUNITGROUPSET_ADD = Add Organisation Unit Group Set
-F_OPTIONSET_ADD = Add Option Set
+F_TRACKED_ENTITY_UPDATE=Update Tracked Entities
+F_VALIDATIONRULEGROUP_ADD=Add Validation Rule Groups
+F_SQLVIEW_ADD=Add SQL View
+F_ORGUNITGROUPSET_ADD=Add Organisation Unit Group Set
+F_OPTIONSET_ADD=Add Option Set
+F_INSERT_CUSTOM_JS_CSS=Insert custom Java script and CSS
#-- FRED API module -----------------------------------------------------------#
