Merge branch 'master' of https://git.dirt.kz/igor/Metadata_PHP
This commit is contained in:
@ -1441,7 +1441,7 @@ class EdtRec
|
||||
if((value=="")&&(maybenull==0)) return false;
|
||||
return isInt(value)
|
||||
}else
|
||||
if(type=="f8")
|
||||
if(type=="f8" || type=="f4")
|
||||
{
|
||||
if((value=="")&&(maybenull==0)) return false;
|
||||
return isFloat(value);
|
||||
|
||||
@ -61,7 +61,7 @@ class DBMSUser
|
||||
{
|
||||
if(findNode(node,'#cdata-section').nodeValue=="0") //if not logged
|
||||
{
|
||||
alert(trt('Invalid_username_and_or_password'));
|
||||
alert2(trt('Attention'),trt('Invalid_username_and_or_password'));
|
||||
}else
|
||||
{
|
||||
//location.reload();
|
||||
@ -76,8 +76,7 @@ class DBMSUser
|
||||
{
|
||||
//if(findNode(node,'#cdata-section').nodeValue=="1") //if register
|
||||
//{
|
||||
// alert(trt('New_user_is_registered')+'\n'+trt('The_password_has_been_sent_to_you_by_Email'));
|
||||
// location.reload();
|
||||
// alert2(trt('Attention'),trt('New_user_is_registered')+'\n'+trt('The_password_has_been_sent_to_you_by_Email'),function(){ location.reload(); });
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
@ -230,8 +230,8 @@ function confirm2(title,text,okFunc,cancelFunc)
|
||||
</tr>\n\
|
||||
<tr style="height: 10px;">\n\
|
||||
<td style="width: 100%;"> </td>\n\
|
||||
<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;">'+trt('Ok')+'</button></td>\n\
|
||||
\<td><button class="button-secondary" id="'+win.uid+'_cancel" style="width: 80px;">'+trt('Cancel')+'</button></td>\n\
|
||||
<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;margin:1px;">'+trt('Ok')+'</button></td>\n\
|
||||
\<td><button class="button-secondary" id="'+win.uid+'_cancel" style="width: 80px;margin:1px;">'+trt('Cancel')+'</button></td>\n\
|
||||
</tr>\n\
|
||||
</table>';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user