Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

fixed bug #4257 Hide fractional seconds#884

Merged
lem9 merged 7 commits intophpmyadmin:QA_4_1phpmyadmin/phpmyadmin:QA_4_1from
vidurangaw:bug#4257vidurangaw/phpmyadmin:bug#4257Copy head branch name to clipboard
Jan 31, 2014
Merged

fixed bug #4257 Hide fractional seconds#884
lem9 merged 7 commits intophpmyadmin:QA_4_1phpmyadmin/phpmyadmin:QA_4_1from
vidurangaw:bug#4257vidurangaw/phpmyadmin:bug#4257Copy head branch name to clipboard

Conversation

@vidurangaw
Copy link
Contributor

Signed-off-by: Viduranga Wijesooriya vpowerrc@gmail.com

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling d483b9f on vpowerrc:bug#4257 into 024a2d3 on phpmyadmin:QA_4_1.

@ghost ghost assigned lem9 Jan 30, 2014
@lem9
Copy link
Contributor

lem9 commented Jan 30, 2014

Looks promising. Here is a bug I found. Testing with MySQL 5.6.15, a DATETIME(0) column. Browse the row, I see "2014-01-30 01:02:03". I click on Edit, then on the calendar icon, and the time displayed is "00:00:00".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need changes in js/jquery/jquery-ui-timepicker-addon.js ? May create conflicts when we update jquery.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. I was only testing the patch's behavior, I had not looked at the code in details.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be ignored. What it is does is hide milliseconds and microseconds sliders when they are not supported in the datetime picker. What do you think ? Where else can I change that function ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess setting "showMicrosec" to false when calling PMA_addDatepicker should work. I'm not sure though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already did that in the commit. It doesn't work

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean if these changes are just to hide the sliders, then they are redundant. I just checked, milli/micro sliders are hidden for me without these changes as well, just by setting "showMicrosec/milliSec" to false, which you have already done.
I'm testing for DATETIME and TIMESTAMP fields.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Sorry, it was my mistake. I commited the changes again. I think it's working fine now

@atul516
Copy link
Contributor

atul516 commented Jan 30, 2014

Apart from what Marc said, datepicker is not displayed anymore for me when editing a timestamp field.

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
@vidurangaw
Copy link
Contributor Author

I'm fixing them

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling efa453a on vpowerrc:bug#4257 into 024a2d3 on phpmyadmin:QA_4_1.

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling fc4ad4b on vpowerrc:bug#4257 into 024a2d3 on phpmyadmin:QA_4_1.

@lem9
Copy link
Contributor

lem9 commented Jan 30, 2014

Viduranga,
in your commit description, please give some details. For example, instead of "fixed bug #4257 Hide fractional seconds #3" I believe you meant "Revert changes in this external library".
In your commit efa453a, what are you trying to fix? I'm asking, because my problem of the time becoming 00:00:00 is still there.

@lem9
Copy link
Contributor

lem9 commented Jan 30, 2014

Atul,
about your problem with TIMESTAMP, you were talking only about grid editing, right? If so, this is fixed for me with efa453a when testing a TIMESTAMP(6).

@vidurangaw
Copy link
Contributor Author

Marc,
okay, sure. It's strange . I fixed that problem with efa453a. I don't get that problem anymore. Are you sure that it still exists ?

@lem9
Copy link
Contributor

lem9 commented Jan 30, 2014

Yes, I'm sure. Your efa453a is for grid editing, but I'm talking about clicking on Edit, then on the calendar icon (datepicker).

@vidurangaw
Copy link
Contributor Author

Okay I saw it now. I was only looking at grid editing before. I will fix it soon. Thanks for pointing out

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
@atul516
Copy link
Contributor

atul516 commented Jan 31, 2014

Marc, yes I was testing grid edit TIMESTAMP, which was fixed with efa453a

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
@vidurangaw
Copy link
Contributor Author

Marc and Atul,
I think everything is working now. Can you please check

@vidurangaw
Copy link
Contributor Author

I found another bug in the current version. There is no timepicker for the 'TIME' type

@lem9 lem9 merged commit 4616eb0 into phpmyadmin:QA_4_1 Jan 31, 2014
@lem9
Copy link
Contributor

lem9 commented Jan 31, 2014

Thanks, I have merged your commits and fixed the merge conflict.

About your other bug, you can open a bug ticket but I'm not sure that the timepicker we use works without the date part.

@vidurangaw
Copy link
Contributor Author

Marc,
Okay. Thanks. No, there is separate picker for that without date. Refer http://trentrichardson.com/examples/timepicker/
I will try to fix it too

@vidurangaw vidurangaw deleted the bug#4257 branch January 31, 2014 13:21
nijel added a commit that referenced this pull request Mar 3, 2014
Changes:

6.0.062 (2014-03-02)
	- The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.

6.0.061 (2014-02-18)
	- Bug #893 "Parsing error on streamed xref for secured pdf" was fixed.

6.0.060 (2014-02-16)
	- Bug #891 "Error on parsing hexa fields" was fixed.
	- Bug #892 "Parsing pdf with trailing space at start" was fixed.

6.0.059 (2014-02-03)
	- SVG 'use' support was imporved.

6.0.058 (2014-01-31)
	- Bug #886 "Bugs with SVG using <defs> and <use>" was fixed.

6.0.057 (2014-01-26)
	- Bug #883 "Parsing error" was fixed.

6.0.056 (2014-01-25)
	- The automatic cache folder selection now works also with some restricted hosting environments.
	- CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz).
	- Bug #884 "Parsing error prev tag looking for" was fixed.

Signed-off-by: Michal Čihař <michal@cihar.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.