mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-05 16:42:53 +01:00
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -342,7 +342,7 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
|
||||
print '<script type="text/javascript">';
|
||||
print ' function getStringArg(){';
|
||||
print ' var pattern = "";';
|
||||
print ' pattern += $("#minlenght").val() + ";";';
|
||||
print ' pattern += $("#minlength").val() + ";";';
|
||||
print ' pattern += $("#NbMajMin").val() + ";";';
|
||||
print ' pattern += $("#NbNumMin").val() + ";";';
|
||||
print ' pattern += $("#NbSpeMin").val() + ";";';
|
||||
@@ -352,14 +352,14 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
|
||||
print ' }';
|
||||
|
||||
print ' function valuePossible(){';
|
||||
print ' var fields = ["#minlenght", "#NbMajMin", "#NbNumMin", "#NbSpeMin", "#NbIteConsecutive"];';
|
||||
print ' var fields = ["#minlength", "#NbMajMin", "#NbNumMin", "#NbSpeMin", "#NbIteConsecutive"];';
|
||||
print ' for(var i = 0 ; i < fields.length ; i++){';
|
||||
print ' if($(fields[i]).val() < $(fields[i]).attr("min")){';
|
||||
print ' return false;';
|
||||
print ' }';
|
||||
print ' }';
|
||||
print ' ';
|
||||
print ' var length = parseInt($("#minlenght").val());';
|
||||
print ' var length = parseInt($("#minlength").val());';
|
||||
print ' var length_mini = parseInt($("#NbMajMin").val()) + parseInt($("#NbNumMin").val()) + parseInt($("#NbSpeMin").val());';
|
||||
print ' return length >= length_mini;';
|
||||
print ' }';
|
||||
@@ -383,7 +383,7 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
|
||||
print ' }';
|
||||
print ' }';
|
||||
|
||||
print ' $("#minlenght").change(function(){valuePatternChange();});';
|
||||
print ' $("#minlength").change(function(){valuePatternChange();});';
|
||||
print ' $("#NbMajMin").change(function(){valuePatternChange();});';
|
||||
print ' $("#NbNumMin").change(function(){valuePatternChange();});';
|
||||
print ' $("#NbSpeMin").change(function(){valuePatternChange();});';
|
||||
|
||||
Reference in New Issue
Block a user