------------------------------------------------------------
revno: 12869
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Mon 2013-11-04 14:21:35 +0100
message:
System settings, removed mandatory validtion for smtp server, should be
possible to set to blank
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.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/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2013-10-08 17:20:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2013-11-04 13:21:35 +0000
@@ -484,11 +484,6 @@
"rangelength" : [ 2, 255 ]
}
},
- "emailSettings" : {
- "smtpHostName" : {
- "required" : true
- }
- },
"SMSConfig" : {
"pollingInterval" : {
"required" : true,
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2013-10-30 14:20:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2013-11-04 13:21:35 +0000
@@ -1,6 +1,6 @@
<script>
jQuery(document).ready(function() {
- validation2( 'emailSettingForm', function( form ) {
+ jQuery("input[type=button]").click(function() {
jQuery.postUTF8( 'setSystemEmailSettings.action', {
smtpHostName: getFieldValue( 'smtpHostName' ),
smtpPort: getFieldValue( 'smtpPort' ),
@@ -12,8 +12,6 @@
setHeaderDelayMessage( json.message );
}
});
- }, {
- "rules" : getValidationRules( "emailSettings" )
});
jQuery( '#smtpHostName' ).blur();
@@ -51,6 +49,6 @@
<label for="smtpTls">$i18n.getString( "tls" )</label>
</div>
-<div class="setting"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></div>
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
</form>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
