Skip to content

/ phpmyadmin

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

Jump to bottom

Fix broken sort #14036

Merged
merged 17 commits into from Feb 22, 2018
Merged

Fix broken sort #14036

merged 17 commits into from Feb 22, 2018
+279 −293

Conversation

@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented Feb 22, 2018 •
edited

Fix #13931

Related to #13887
@mauriciofauth mauriciofauth requested a review from nijel Feb 22, 2018
@codecov
Copy link

@codecov codecov bot commented Feb 22, 2018 •
edited

Codecov Report

Merging #14036 into QA_4_7 will decrease coverage by 0.02%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           QA_4_7   #14036      +/-   ##
==========================================
- Coverage   54.29%   54.26%   -0.03%     
==========================================
  Files         467      467              
  Lines       70253    70189      -64     
==========================================
- Hits        38141    38090      -51     
+ Misses      32112    32099      -13
@nijel
nijel suggested changes Feb 22, 2018
View changes
Copy link
Contributor

@nijel nijel left a comment •
edited

Seems like some fixes from master are still missing. Here is list of related fixes in master and at least first few ones are missing, I haven't checked rest:

  • 1fc566f Share code for parsing data-post attribute
  • 2bc8721 Adjust RTE oprations to use POST
  • 613a146 Adjust field drop to use POST
  • 7508205 Adjust optimize table to use POST
  • 599a981 Adjust partition manipulations to use POST
  • e7eaea8 Adjust browsing distinct values to use POST
  • 6ee2f12 Adjust adding table key operations to use POST
  • 8332861 Adjust table drop operation to use POST
  • ff20564 Adjust table truncate operation to use POST
  • 99e9854 Always use POST for links containing SQL query
  • 816c426 Add tests for Util::linkOrButton
  • 3b9fb2b Simplify handling of long URLs in Util::linkOrButton
mauriciofauth and others added 13 commits Feb 22, 2018
@mauriciofauth
Revert "Force using POST for SQL query in Util::linkOrButton"
c75166c 
This reverts commit 44df4a3.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Simplify handling of long URLs in Util::linkOrButton
be7d5ee 
We no longer create form, but rather rather tag the link to be handled
as POST on the client side.

This way the code is way simpler without need on any special case
handling on server side.

Fixes #13649

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 3b9fb2b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Add tests for Util::linkOrButton
f31dfc5 
Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 816c426)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Always use POST for links containing SQL query
6f4740e 
This way the SQL queries will not apper in the web server logs.

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 99e9854)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Handle data-post with leading ?
8d238a3 
This makes it easier to convert existing code.

Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit f059baa)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust table truncate operation to use POST
35dc6d4 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit ff20564)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust table drop operation to use POST
a20b287 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 8332861)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust adding table key operations to use POST
9af081a 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 6ee2f12)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust browsing distinct values to use POST
8229dab 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit e7eaea8)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust partition manipulations to use POST
590b0ed 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 599a981)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust optimize table to use POST
f6bb190 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 7508205)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust field drop to use POST
19484ad 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 613a146)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Adjust RTE oprations to use POST
8f9f8aa 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 2bc8721)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@mauriciofauth mauriciofauth force-pushed the mauriciofauth:broken-sort branch from 83c91f0 to fc6cb86 Feb 22, 2018
nijel added 2 commits Dec 15, 2017
@nijel @mauriciofauth
Adjust table operations to use POST
fc378b0 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 6b5d535)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@nijel @mauriciofauth
Share code for parsing data-post attribute
1f00c99 
It can include leading question mark and we should deal with it in all
locations.

Fixes #13913

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 1fc566f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@mauriciofauth mauriciofauth force-pushed the mauriciofauth:broken-sort branch from fc6cb86 to 106c60c Feb 22, 2018
mauriciofauth and others added 2 commits Jan 8, 2018
@mauriciofauth
Fix getPostData function
60032ce 
dataPost can be undefined

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 367f49b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@Gemorroj @mauriciofauth
Update tbl_operations.js
Loading status checks…
031c832 
fix maintenance operations

Signed-off-by: Gemorroj <wapinet@gmail.com>
(cherry picked from commit b3c9a0c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@mauriciofauth mauriciofauth force-pushed the mauriciofauth:broken-sort branch from 106c60c to 031c832 Feb 22, 2018
@mauriciofauth
Copy link
Member Author

@mauriciofauth mauriciofauth commented Feb 22, 2018 •
edited

@nijel What do you think now?
@nijel nijel self-assigned this Feb 22, 2018
@nijel nijel merged commit c21a9cf into phpmyadmin:QA_4_7 Feb 22, 2018
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
DCO All commits have a DCO sign-off from the author
@nijel
Copy link
Contributor

@nijel nijel commented Feb 22, 2018

I think it's good to merge now, thanks! Still this needs heavy testing now to discover possible breakages...
@nijel nijel added this to the 4.7.9 milestone Feb 22, 2018
@mauriciofauth mauriciofauth deleted the mauriciofauth:broken-sort branch Feb 22, 2018
@devenbansod
Copy link
Member

@devenbansod devenbansod commented Mar 1, 2018

This should ideally fix the issue at #13887 too, right?
@nijel nijel mentioned this pull request Mar 1, 2018
Closed
@mauriciofauth mauriciofauth mentioned this pull request Mar 1, 2018
Closed
nijel added a commit that referenced this pull request Mar 1, 2018
@nijel
Changelog for #14036
Loading status checks…
c9153ed 
Signed-off-by: Michal Čihař <michal@cihar.com>
@nijel nijel mentioned this pull request Mar 1, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nijel nijel

Assignees

@nijel nijel

Labels
None yet
Projects
None yet
Milestone
4.7.9
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@mauriciofauth @nijel @devenbansod @Gemorroj