← Back to team overview

dhis2-devs team mailing list archive

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

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4567: Fixed in showing the feedback message when exporting PDF in list page.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 4567
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-09-12 13:19:59 +0700
message:
  Fixed in showing the feedback message when exporting PDF in list page.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/messages.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/pdf/ExportToPdfAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java
  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_vi_VN.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-commons-resources/src/main/webapp/dhis-web-commons/i18n/messages.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/messages.vm	2011-08-19 18:37:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/messages.vm	2011-09-12 06:19:59 +0000
@@ -20,6 +20,7 @@
 var i18n_enter_digits = '$encoder.jsEscape($i18n.getString( 'please_enter_a_valid_digits' ) , "'")'
 var i18n_process = '$encoder.jsEscape( $i18n.getString( "process" ) , "'" )';
 var i18n_delete_success = '$encoder.jsEscape( $i18n.getString( "delete_success" ) , "'" )';
+var i18n_no_item_to_export = '$encoder.jsEscape( $i18n.getString( "no_item_to_export" ) , "'" )';
 
 var validationMessage	= {
 		 required: '$encoder.jsEscape($i18n.getString( 'this_field_is_required' ) , "'")'

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-09-12 06:19:59 +0000
@@ -1340,7 +1340,7 @@
 {	
 	if ( jQuery( "table.listTable tbody tr" ).length == 0 )
 	{
-		showWarningMessage( 'no_item_to_export' );
+		showWarningMessage( i18n_no_item_to_export );
 		return;
 	}
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/pdf/ExportToPdfAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/pdf/ExportToPdfAction.java	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/pdf/ExportToPdfAction.java	2011-09-12 06:19:59 +0000
@@ -178,7 +178,7 @@
                 {
                     dataElements = new ArrayList<DataElement>( dataElementService.searchDataElementsByName( key ) );
                 }
-                else if ( dataDictionaryId != null )
+                else if ( dataDictionaryId != null && dataDictionaryId != -1 )
                 {
                     dataElements = new ArrayList<DataElement>( dataDictionaryService.getDataElementsByDictionaryId( dataDictionaryId ) );
                 }
@@ -210,7 +210,7 @@
                 {
                     indicators = new ArrayList<Indicator>( indicatorService.getIndicatorsLikeName( key ) );
                 }
-                else if ( dataDictionaryId != null )
+                else if ( dataDictionaryId != null && dataDictionaryId != -1 )
                 {
                     indicators = new ArrayList<Indicator>( dataDictionaryService.getDataDictionary( dataDictionaryId )
                         .getIndicators() );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2011-09-12 06:19:59 +0000
@@ -678,8 +678,6 @@
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
     <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService"/>
     <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService"/>
-    
-	
   </bean>
 
 	<!-- Other -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java	2011-09-12 06:19:59 +0000
@@ -186,7 +186,7 @@
                 }
                 else
                 {
-                    params.setUsers( null );
+                    params.setUserObjects( null );
                 }
 
                 fileName = FILENAME_USER;

=== 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	2011-09-04 10:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-09-12 06:19:59 +0000
@@ -173,6 +173,7 @@
 user_management = User management
 filter_by_username = Filter by username
 username = Username
+fullname = Fullname
 role = Role
 user = User
 user_by_orgunit = User by Organisation Unit

=== 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	2011-03-23 04:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2011-09-12 06:19:59 +0000
@@ -1,5 +1,6 @@
 username_in_use=T\u00ean t\u00e0i kho\u1ea3n n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng. Xin vui l\u00f2ng ch\u1ecdn m\u1ed9t t\u00ean t\u00e0i kho\u1ea3n kh\u00e1c
 username=T\u00ean t\u00e0i kho\u1ea3n
+fullname=H\u1ecd v\u00e0 t\u00ean
 user_use_group=C\u00f3 c\u00e1c ng\u01b0\u1eddi d\u00f9ng s\u1eed d\u1ee5ng ph\u00e2n quy\u1ec1n n\u00e0y
 user_role_management=Qu\u1ea3n l\u00fd ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
 user_role=Ph\u00e2n quy\u1ec1n
  Thread Previous • Date Previous • • Thread Next