Skip to content

Commit 13ca451

Browse files
committed
Correct error in projects listing introduced during recent refactoring.
1 parent 60988ee commit 13ca451

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ nb*
1212
# /src/main/java/com/parallax/server/blocklyprop/db/generated/*
1313
#
1414

15+
*.sh
16+
17+
1518
#################
1619
## NetBeans
1720
#################

pom.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -549,5 +549,12 @@
549549
<version>4.12</version>
550550
<scope>test</scope>
551551
</dependency>
552-
</dependencies>
552+
553+
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
554+
<dependency>
555+
<groupId>org.jetbrains</groupId>
556+
<artifactId>annotations</artifactId>
557+
<version>17.0.0</version>
558+
</dependency>
559+
</dependencies>
553560
</project>

src/main/java/com/parallax/server/blocklyprop/rest/RestProject.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ public Response get(
163163

164164
// Sort flag evaluation
165165
if (!restProjectUtils.ValidateSortType(sort)) {
166-
LOG.warn("{} Sort parameter failed", endPoint);
167-
return Response.status(Response.Status.NOT_ACCEPTABLE).build();
166+
LOG.warn("{} Sort parameter failed. Defaulting to sort by project name", endPoint);
167+
sort = TableSort.name;
168168
}
169169

170170
// Sort order evaluation
171171
if (!restProjectUtils.ValidateSortOrder(order)) {
172-
LOG.warn("{} Sort order parameter failed", endPoint);
173-
return Response.status(Response.Status.NOT_ACCEPTABLE).build();
172+
LOG.warn("{} Sort order parameter failed. Defaulting to ascending order", endPoint);
173+
order = TableOrder.asc;
174174
}
175175

176176
// Limit result set value

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ footer.clientdownloadlink = BlocklyProp-client
2828
# Application version numbers.
2929
application.major = 1
3030
application.minor = 1
31-
application.build = 452
31+
application.build = 453
3232

3333
html.content_missing = Content missing
3434

0 commit comments

Comments
 (0)