Skip to content

Commit eb5a332

Browse files
authored
Query: sort columns where name starts with '+' (#7398)
1 parent 89232a1 commit eb5a332

10 files changed

Lines changed: 23 additions & 23 deletions

File tree

api/src/org/labkey/api/data/Sort.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ else if (str.charAt(0) == SortDirection.ASC.dir)
145145

146146
public String toUrlString()
147147
{
148-
return (_dir == SortDirection.ASC ? "" : "-") + _fieldKey.toString();
148+
return (_dir == SortDirection.ASC ? "+" : "-") + _fieldKey.toString();
149149
}
150150

151151
private SQLFragment toOrderByFragment(SqlDialect dialect, DatabaseIdentifier alias)

api/webapp/clientapi/dom/DataRegion.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,8 +2999,8 @@ if (!LABKEY.DataRegions) {
29992999
});
30003000
}
30013001

3002-
if (direction === SORT_ASC) { // Easier to read without the encoded + on the URL...
3003-
direction = '';
3002+
if (!direction) {
3003+
direction = SORT_ASC;
30043004
}
30053005

30063006
if (LABKEY.Utils.isString(direction)) {

assay/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assay/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
1313
},
1414
"dependencies": {
15-
"@labkey/components": "7.16.0"
15+
"@labkey/components": "7.16.1"
1616
},
1717
"devDependencies": {
1818
"@labkey/build": "8.8.0",

core/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454
},
5555
"dependencies": {
56-
"@labkey/components": "7.16.0",
56+
"@labkey/components": "7.16.1",
5757
"@labkey/themes": "1.6.0"
5858
},
5959
"devDependencies": {

experiment/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

experiment/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
1414
},
1515
"dependencies": {
16-
"@labkey/components": "7.16.0"
16+
"@labkey/components": "7.16.1"
1717
},
1818
"devDependencies": {
1919
"@labkey/build": "8.8.0",

pipeline/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pipeline/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
1515
},
1616
"dependencies": {
17-
"@labkey/components": "7.16.0"
17+
"@labkey/components": "7.16.1"
1818
},
1919
"devDependencies": {
2020
"@labkey/build": "8.8.0",

0 commit comments

Comments
 (0)