igor/Metadata_PHP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.dirt.kz/igor/Metadata_PHP

Browse Source
This commit is contained in:
igor
2021-11-08 20:36:47 +06:00
parent c6b7413c4f 9b11fb813a
commit 0ee4dd3d48
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
metadata/dbms/editrecord.js
View File

@ -1441,7 +1441,7 @@ class EdtRec
if((value=="")&&(maybenull==0)) return false; if((value=="")&&(maybenull==0)) return false;
return isInt(value) return isInt(value)
}else }else
if(type=="f8") if(type=="f8" || type=="f4")
{ {
if((value=="")&&(maybenull==0)) return false; if((value=="")&&(maybenull==0)) return false;
return isFloat(value); return isFloat(value);

5
metadata/dbms/login.js
View File

@ -61,7 +61,7 @@ class DBMSUser
{ {
if(findNode(node,'#cdata-section').nodeValue=="0") //if not logged 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 }else
{ {
//location.reload(); //location.reload();
@ -76,8 +76,7 @@ class DBMSUser
{ {
//if(findNode(node,'#cdata-section').nodeValue=="1") //if register //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')); // alert2(trt('Attention'),trt('New_user_is_registered')+'\n'+trt('The_password_has_been_sent_to_you_by_Email'),function(){ location.reload(); });
// location.reload();
//} //}
} }
} }

4
metadata/dbms/tools.js
View File

@ -230,8 +230,8 @@ function confirm2(title,text,okFunc,cancelFunc)
</tr>\n\ </tr>\n\
<tr style="height: 10px;">\n\ <tr style="height: 10px;">\n\
<td style="width: 100%;">&nbsp;</td>\n\ <td style="width: 100%;">&nbsp;</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+'_ok" style="width: 80px;margin:1px;">'+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+'_cancel" style="width: 80px;margin:1px;">'+trt('Cancel')+'</button></td>\n\
</tr>\n\ </tr>\n\
</table>'; </table>';