dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14150
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4685: Fixed export pdf using hidden field and removed the unnecessary validation. Renamed validation ru...
------------------------------------------------------------
revno: 4685
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-09-26 16:31:56 +0700
message:
Fixed export pdf using hidden field and removed the unnecessary validation. Renamed validation rule action.
modified:
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/macros.vm
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/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/pdf/ExportToPdfAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
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/webapp/dhis-web-maintenance-user/allUser.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/pdf/ExportToPdfAction.java
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm
--
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/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-09-26 06:29:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-09-26 09:31:56 +0000
@@ -1336,7 +1336,7 @@
/**
* Used to export PDF file by the given type and the filter params in page
*/
-function exportPdfByType( params )
+function exportPdfByType( type, params )
{
if ( jQuery( "table.listTable tbody tr" ).length == 0 )
{
@@ -1347,13 +1347,7 @@
var form = byId( 'filterKeyForm' );
form.action = 'exportToPdf.action?' + params;
form.submit();
-}
-
-function validateExportPDF()
-{
- var exportButton = jQuery( 'input[type=button][id=exportPDF]' );
- if ( byId( 'key' ).value != byId( 'oldKey' ).value ) exportButton.attr( 'disabled', true );
- else exportButton.attr( 'disabled', false );
+ form.action = type + '.action';
}
/**
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2011-09-26 09:31:56 +0000
@@ -119,8 +119,8 @@
<form id="filterKeyForm" action="${action}.action" method="POST">
<div style="inline">
#set ($value = $encoder.htmlEncode( ${key} ))
- <input type="text" id="key" name="key" value="$!value" onchange="validateExportPDF()"/>
- <input type="hidden" id="oldKey" name="oldKey" value="$!value"/>
+ <input type="text" id="key" name="key" value="$!value"/>
+ <input type="hidden" id="curKey" name="curKey" value="$!value"/>
<input type="submit" value="$i18n.getString( 'filter' )"/>
<input type="button" value="$i18n.getString( 'clear' )"
onclick="window.location.href='${action}.action'"/>
=== 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-12 06:19:59 +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-26 09:31:56 +0000
@@ -62,7 +62,7 @@
private static final String EXPORT_FORMAT_PDF = "PDF";
- private static final String TYPE_DATAELEMENT = "dataelement";
+ private static final String TYPE_DATAELEMENT = "dataElement";
private static final String TYPE_INDICATOR = "indicator";
@@ -145,11 +145,11 @@
this.dataDictionaryId = dataDictionaryId;
}
- private String key;
+ private String curKey;
- public void setKey( String key )
+ public void setCurKey( String curKey )
{
- this.key = key;
+ this.curKey = curKey;
}
private String type;
@@ -174,20 +174,21 @@
{
List<DataElement> dataElements = null;
- if ( isNotBlank( key ) ) // Filter on key only if set
+ if ( isNotBlank( curKey ) ) // Filter on key only if set
{
- dataElements = new ArrayList<DataElement>( dataElementService.searchDataElementsByName( key ) );
+ dataElements = new ArrayList<DataElement>( dataElementService.searchDataElementsByName( curKey ) );
}
else if ( dataDictionaryId != null && dataDictionaryId != -1 )
{
- dataElements = new ArrayList<DataElement>( dataDictionaryService.getDataElementsByDictionaryId( dataDictionaryId ) );
+ dataElements = new ArrayList<DataElement>( dataDictionaryService
+ .getDataElementsByDictionaryId( dataDictionaryId ) );
}
else
{
dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
}
-
- Collections.sort( dataElements, new DataElementNameComparator() );
+
+ Collections.sort( dataElements, new DataElementNameComparator() );
if ( (dataElements != null) && !dataElements.isEmpty() )
{
@@ -206,9 +207,9 @@
{
List<Indicator> indicators = null;
- if ( isNotBlank( key ) ) // Filter on key only if set
+ if ( isNotBlank( curKey ) ) // Filter on key only if set
{
- indicators = new ArrayList<Indicator>( indicatorService.getIndicatorsLikeName( key ) );
+ indicators = new ArrayList<Indicator>( indicatorService.getIndicatorsLikeName( curKey ) );
}
else if ( dataDictionaryId != null && dataDictionaryId != -1 )
{
@@ -219,7 +220,7 @@
{
indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
}
-
+
Collections.sort( indicators, new IndicatorNameComparator() );
if ( (indicators != null) && !indicators.isEmpty() )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-09-26 09:31:56 +0000
@@ -43,7 +43,7 @@
</div>
</td>
<td style="text-align:right">
- <input type="button" id="exportPDF" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'dataelement' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'dataElement' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortDataElementForm.action'" style="width:80px"/>
#if ( $!dataDictionaryMode && $dataDictionaryMode == "extended" )
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddExtendedDataElementForm.action'" style="width:80px"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2011-09-26 09:31:56 +0000
@@ -31,7 +31,7 @@
</div>
</td>
<td style="text-align:right">
- <input type="button" id="exportPDF" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'indicator' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'indicator' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortIndicatorForm.action'" style="width:80px"/>
#if ( $dataDictionaryMode == "extended" )
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddExtendedIndicatorForm.action'" style="width:80px"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-09-21 03:42:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-09-26 09:31:56 +0000
@@ -3,7 +3,7 @@
var params = "type=" + type;
params += "&dataDictionaryId=" + jQuery( '#dataDictionaryList' ).val();
- exportPdfByType( params );
+ exportPdfByType( type, params );
}
function changeValueType( value )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2011-09-21 03:42:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2011-09-26 09:31:56 +0000
@@ -3,7 +3,7 @@
var params = "type=" + type;
params += "&dataDictionaryId=" + jQuery( '#dataDictionaryList' ).val();
- exportPdfByType( params );
+ exportPdfByType( type, params );
}
function indicatorTypeChanged()
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/pdf/ExportToPdfAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/pdf/ExportToPdfAction.java 2011-09-14 03:57:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/pdf/ExportToPdfAction.java 2011-09-26 09:31:56 +0000
@@ -60,7 +60,7 @@
private static final String EXPORT_FORMAT_PDF = "PDF";
- private static final String TYPE_ORGANISATIONUNIT = "organisationunit";
+ private static final String TYPE_ORGANISATIONUNIT = "organisationUnit";
private static final String FILENAME_ORGANISATIONUNIT = "Organisationunits.zip";
@@ -125,11 +125,11 @@
// Input
// -------------------------------------------------------------------------
- private String key;
+ private String curKey;
- public void setKey( String key )
+ public void setCurKey( String curKey )
{
- this.key = key;
+ this.curKey = curKey;
}
private String type;
@@ -168,9 +168,9 @@
}
}
- if ( isNotBlank( key ) )
+ if ( isNotBlank( curKey ) )
{
- organisationUnitService.searchOrganisationUnitByName( organisationUnits, key );
+ organisationUnitService.searchOrganisationUnitByName( organisationUnits, curKey );
}
Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2011-09-21 03:42:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2011-09-26 09:31:56 +0000
@@ -20,7 +20,7 @@
{
var params = "type=" + type;
- exportPdfByType( params );
+ exportPdfByType( type, params );
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2011-09-26 09:31:56 +0000
@@ -18,7 +18,7 @@
<tr>
<td>#filterDiv( "organisationUnit" )</td>
<td colspan="3" style="text-align:right">
- <input type="button" id="exportPDF" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'organisationunit' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'organisationUnit' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddOrganisationUnitForm.action'"/>
</td>
</tr>
=== 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-12 06:19:59 +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-26 09:31:56 +0000
@@ -61,7 +61,7 @@
private static final String EXPORT_FORMAT_PDF = "PDF";
- private static final String TYPE_USER = "user";
+ private static final String TYPE_USER = "alluser";
private static final String FILENAME_USER = "Users.zip";
@@ -126,11 +126,11 @@
// Input
// -------------------------------------------------------------------------
- private String key;
+ private String curKey;
- public void setKey( String key )
+ public void setCurKey( String curKey )
{
- this.key = key;
+ this.curKey = curKey;
}
private Integer months;
@@ -162,9 +162,9 @@
if ( type.equals( TYPE_USER ) )
{
- if ( isNotBlank( key ) ) // Filter on key only if set
+ if ( isNotBlank( curKey ) ) // Filter on key only if set
{
- userCredentialsList = new ArrayList<UserCredentials>( userService.searchUsersByName( key ) );
+ userCredentialsList = new ArrayList<UserCredentials>( userService.searchUsersByName( curKey ) );
}
else if ( months != null && months != 0 )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2011-09-26 09:31:56 +0000
@@ -32,7 +32,7 @@
</select>
</td>
<td colspan="3" style="text-align:right">
- <input type="button" id="exportPDF" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'user' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'alluser' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddUserForm.action'"/>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js 2011-09-21 03:42:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js 2011-09-26 09:31:56 +0000
@@ -8,7 +8,7 @@
var params = "type=" + type;
params += "&months=" + jQuery( '#months' ).val();
- exportPdfByType( params );
+ exportPdfByType( type, params );
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/pdf/ExportToPdfAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/pdf/ExportToPdfAction.java 2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/pdf/ExportToPdfAction.java 2011-09-26 09:31:56 +0000
@@ -58,7 +58,7 @@
private static final String EXPORT_FORMAT_PDF = "PDF";
- private static final String TYPE_VALIDATION_RULE = "validationrule";
+ private static final String TYPE_VALIDATION_RULE = "validationRule";
private static final String FILENAME_VALIDATION_RULE = "ValidationRules.zip";
@@ -107,11 +107,11 @@
this.type = type;
}
- private String key;
+ private String curKey;
- public void setKey( String key )
+ public void setCurKey( String curKey )
{
- this.key = key;
+ this.curKey = curKey;
}
// -------------------------------------------------------------------------
@@ -145,9 +145,9 @@
if ( type.equals( TYPE_VALIDATION_RULE ) )
{
- if ( isNotBlank( key ) ) // Filter on key only if set
+ if ( isNotBlank( curKey ) ) // Filter on key only if set
{
- validationRulesList = new ArrayList<ValidationRule>( validationRuleService.getValidationRulesByName( key ) );
+ validationRulesList = new ArrayList<ValidationRule>( validationRuleService.getValidationRulesByName( curKey ) );
}
else
{
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2011-07-28 08:10:02 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2011-09-26 09:31:56 +0000
@@ -16,7 +16,7 @@
<!-- ValidationRule CRUD operations -->
- <action name="showValidationRuleForm" class="org.hisp.dhis.validationrule.action.GetValidationRuleListAction">
+ <action name="validationRule" class="org.hisp.dhis.validationrule.action.GetValidationRuleListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-validationrule/validationRule.vm</param>
<param name="menu">/dhis-web-validationrule/menu.vm</param>
@@ -38,7 +38,7 @@
</action>
<action name="addValidationRule" class="org.hisp.dhis.validationrule.action.AddValidationRuleAction">
- <result name="success" type="redirect">showValidationRuleForm.action</result>
+ <result name="success" type="redirect">validationRule.action</result>
<param name="requiredAuthorities">F_VALIDATIONRULE_ADD</param>
</action>
@@ -68,7 +68,7 @@
</action>
<action name="updateValidationRule" class="org.hisp.dhis.validationrule.action.UpdateValidationRuleAction">
- <result name="success" type="redirect">showValidationRuleForm.action</result>
+ <result name="success" type="redirect">validationRule.action</result>
<param name="requiredAuthorities">F_VALIDATIONRULE_UPDATE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2011-03-29 08:15:49 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2011-09-26 09:31:56 +0000
@@ -55,7 +55,7 @@
<td></td>
<td>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em">
- <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showValidationRuleForm.action'" style="width:10em">
+ <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='validationRule.action'" style="width:10em">
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm 2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm 2011-09-26 09:31:56 +0000
@@ -8,7 +8,7 @@
<h3>$i18n.getString( "dhis-web-validationrule" )</h3>
<ul id="introList">
- #introListImgItem( "showValidationRuleForm.action" "validation_rule" "validationrule" )
+ #introListImgItem( "validationRule.action" "validation_rule" "validationrule" )
#introListImgItem( "showValidationRuleGroupForm.action" "validation_rule_group" "validationrule" )
#introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )
#introListImgItem( "viewAnalysisForm.action?key=stddevoutlier" "stddevoutlier_analysis" "validationanalysis" )
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm 2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm 2011-09-26 09:31:56 +0000
@@ -1,7 +1,7 @@
<h2>$i18n.getString( "validation_rule" ) </h2>
<ul>
- <li><a href="showValidationRuleForm.action">$i18n.getString( "validation_rule" ) </a></li>
+ <li><a href="validationRule.action">$i18n.getString( "validation_rule" ) </a></li>
<li><a href="showValidationRuleGroupForm.action">$i18n.getString( "validation_rule_group" ) </a></li>
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm 2011-03-29 08:15:49 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm 2011-09-26 09:31:56 +0000
@@ -61,7 +61,7 @@
<tr>
<td></td>
<td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"><input
- type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showValidationRuleForm.action'" style="width:10em"></td>
+ type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='validationRule.action'" style="width:10em"></td>
</tr>
</table>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2011-09-26 06:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2011-09-26 09:31:56 +0000
@@ -7,7 +7,7 @@
{
var params = "type=" + type;
- exportPdfByType( params );
+ exportPdfByType( type, params );
}
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_validation_rule" ) , "'")';
@@ -27,9 +27,9 @@
<td style="vertical-align:top">
<table width="100%">
<tr>
- <td>#filterDiv( "showValidationRuleForm" )</td>
+ <td>#filterDiv( "validationRule" )</td>
<td style="text-align:right">
- <input type="button" id="exportPDF" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'validationrule' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'validationRule' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddValidationRuleForm.action'">
</td>
</tr>
