galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrades from IceHrm Pro v24

Browse Source
This commit is contained in:
gamonoid
2018-07-03 03:10:32 +02:00
parent 8b276d54e6
commit 9cee4e91df
8253 changed files with 659182 additions and 47489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/modules/employees/lib.js
View File

@@ -251,6 +251,8 @@ EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
$("#"+this.getTableName()+" #" + fields[i][0]+"_Name").html(data[fields[i][0]+"_Name"]);
}
$("#"+this.getTableName()+" #supervisor_Name").html(data["supervisor_Name"]);
var subordinates = "";
for(var i=0;i<data.subordinates.length;i++){
if(data.subordinates[i].first_name != undefined && data.subordinates[i].first_name != null){
@@ -350,14 +352,13 @@ EmployeeAdapter.method('changePasswordConfirm', function() {
$('#adminUsersChangePwd_error').hide();
var passwordValidation = function (str) {
var val = /^[a-zA-Z0-9]\w{6,}$/;
return str != null && val.test(str);
return str.length > 7;
};
var password = $('#adminUsersChangePwd #newpwd').val();
if(!passwordValidation(password)){
$('#adminUsersChangePwd_error').html("Password may contain only letters, numbers and should be longer than 6 characters");
$('#adminUsersChangePwd_error').html("Password should be longer than 7 characters");
$('#adminUsersChangePwd_error').show();
return;
}