Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a05ab9640bf44b86334f522fbc634cb64444d976 https://github.com/phpmyadmin/phpmyadmin/commit/a05ab9640bf44b86334f522fbc63... Author: Aditya Sastry ganeshaditya1@gmail.com Date: 2014-03-24 (Mon, 24 Mar 2014)

Changed paths: A js/columndelete.js M js/makegrid.js M js/messages.php M libraries/DisplayResults.class.php M sql.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Multicolumn sorting feature request(1507)

This patch completely implements the feature requested and it modifies 4 existing files and adds one extra Javascript file. The existing system for one column sorting has been refactored to be used for multicolumn sort.

Files messages.php and makegrid.js where modified to add the tool tip.

File sql.php was modified to add the import statement for the newly added JS file.

The newly added columndelete.js is responsible for shift deleting the columns. It gets the url of the link that was shift clicked and removes the name of the column which we want to remove from the order by clause.

Finally, most of the crux of this feature request is implemented through changes to the DisplayResult.class.php. 4 methods of this class have been refactored to accomodate the required change. getsortparams() which process the order by clause text remains the same, just the output parameters have been turned into a array for each order by clause column. isInSort() has been modified to check multiple order by clauses. The smart ordering feature in to form a new function makeURL, which makes the url for multiple sorted table's header's button's targets.

Signed-off-by: Aditya Sastry ganeshaditya1@gmail.com

Commit: 8dd5df2a7f67bd314899a7f2e75ffd1eccaed201 https://github.com/phpmyadmin/phpmyadmin/commit/8dd5df2a7f67bd314899a7f2e75f... Author: Michal Čihař michal@cihar.com Date: 2014-03-24 (Mon, 24 Mar 2014)

Changed paths: A js/columndelete.js M js/makegrid.js M js/messages.php M libraries/DisplayResults.class.php M sql.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Merge pull request #1077 from ganeshaditya1/multicolumn

Multicolumn sorting feature request(1507)

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/869b17c0f87b...8dd5df2a7f67