Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix get unix timestamp for monitor #16078

Merged
merged 1 commit into from Apr 14, 2020
Merged

Conversation

long76
Copy link
Contributor

@long76 long76 commented Apr 14, 2020

Signed-off-by: Gleb Borkov long76.git@mail.ru

Description

Used intval for return unixtime in ms. In some locales uses comma-separated in float values and monitor.js return NaN by implicit conversion.

Fixes #16070

Before submitting pull request, please review the following checklist:

  • Make sure you have read our CONTRIBUTING.md document.
  • Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the master branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
  • Every commit has proper Signed-off-by line as described in our DCO. This ensures that the work you're submitting is your own creation.
  • Every commit has a descriptive commit message.
  • Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
  • Any new functionality is covered by tests.

@codecov
Copy link

codecov bot commented Apr 14, 2020

Codecov Report

Merging #16078 into QA_5_0 will not change coverage.
The diff coverage is 50.00%.

@@            Coverage Diff            @@
##             QA_5_0   #16078   +/-   ##
=========================================
  Coverage     53.06%   53.06%           
  Complexity    14187    14187           
=========================================
  Files           482      482           
  Lines         62243    62243           
=========================================
  Hits          33028    33028           
  Misses        29215    29215           

@williamdes williamdes changed the base branch from master to QA_5_0 April 14, 2020 13:05
@williamdes williamdes added this to the 5.0.3 milestone Apr 14, 2020
@williamdes williamdes added this to In progress in pull-requests via automation Apr 14, 2020
@williamdes williamdes moved this from In progress to To merge in pull-requests Apr 14, 2020
@williamdes williamdes self-assigned this Apr 14, 2020
Signed-off-by: Gleb Borkov <long76.git@mail.ru>
williamdes added a commit that referenced this pull request Apr 14, 2020
Signed-off-by: William Desportes <williamdes@wdes.fr>
@williamdes williamdes merged commit 7df3db2 into phpmyadmin:QA_5_0 Apr 14, 2020
pull-requests automation moved this from To merge to Done Apr 14, 2020
@williamdes
Copy link
Member

Thank you for your contribution @long76 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
pull-requests
  
Done
Development

Successfully merging this pull request may close these issues.

No charts in monitor when using a decimal separator ","
2 participants