Skip to content
Snippets Groups Projects
Commit 66667f9b authored by Prasad's avatar Prasad
Browse files

Merge branch 'fix_#126' into 'master'

Fix #126

just a proposal, idea taken from user preference edit js

See merge request !43
parents b98c223d 5dec5c6a
No related branches found
No related tags found
No related merge requests found
...@@ -67,6 +67,12 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{ ...@@ -67,6 +67,12 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{
registerRecordPreSaveEvent : function(form){ registerRecordPreSaveEvent : function(form){
var thisInstance = this; var thisInstance = this;
form.on(Vtiger_Edit_Js.recordPreSave, function(e, data) { form.on(Vtiger_Edit_Js.recordPreSave, function(e, data) {
var groupingSeperatorValue = jQuery('[name="currency_grouping_separator"]', form).val();
var decimalSeperatorValue = jQuery('[name="currency_decimal_separator"]', form).val();
if(groupingSeperatorValue == decimalSeperatorValue){
Vtiger_Helper_Js.showPnotify(app.vtranslate('JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME'));
e.preventDefault();
}
var userName = jQuery('input[name="user_name"]').val(); var userName = jQuery('input[name="user_name"]').val();
var newPassword = jQuery('input[name="user_password"]').val(); var newPassword = jQuery('input[name="user_password"]').val();
var confirmPassword = jQuery('input[name="confirm_password"]').val(); var confirmPassword = jQuery('input[name="confirm_password"]').val();
...@@ -76,7 +82,6 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{ ...@@ -76,7 +82,6 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{
Vtiger_Helper_Js.showPnotify(app.vtranslate('JS_REENTER_PASSWORDS')); Vtiger_Helper_Js.showPnotify(app.vtranslate('JS_REENTER_PASSWORDS'));
e.preventDefault(); e.preventDefault();
} }
if(!(userName in thisInstance.duplicateCheckCache)) { if(!(userName in thisInstance.duplicateCheckCache)) {
thisInstance.checkDuplicateUser(userName).then( thisInstance.checkDuplicateUser(userName).then(
function(data){ function(data){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment