Skip to content

Commit

Permalink
release 1.5.0 version and updated error fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
jkandasa committed Dec 11, 2019
1 parent e0ab7c9 commit 2aba103
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 13 deletions.
4 changes: 2 additions & 2 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.mycontroller.standalone</groupId>
<artifactId>mycontroller-standalone-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.5.0</version>
</parent>

<artifactId>mycontroller-dist</artifactId>
Expand All @@ -32,7 +32,7 @@
<properties>
<mc.dist.finalName>${project.artifactId}-standalone-${project.version}</mc.dist.finalName>
<mc.dist.jar.finalName>${mc.dist.finalName}-single</mc.dist.jar.finalName>
<mc.gui.version>29</mc.gui.version>
<mc.gui.version>30</mc.gui.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dist/src/main/package/www/partials/export/export-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</button>
<ul class="dropdown-menu">
<li ng-class="{'disabled': itemIds.length == 0}"><a href='' ng-click="itemIds.length == 0 || delete()" class="text-danger"><i class="fa fa-lg fa-trash"></i> {{ 'DELETE' | translate }}</a></li>
<!-- <li ng-class="{'disabled': itemIds.length != 1}"><a href='' ng-click="itemIds.length != 1 || importItemFn()" class="text-default"><i class="fa fa-lg fa-download"></i> {{ 'IMPORT' | translate }}</a></li> -->
<!-- <li ng-class="{'disabled': itemIds.length != 1}"><a href='' ng-click="itemIds.length != 1 || importItemFn()" class="text-default"><i class="fa fa-lg fa-download"></i> {{ 'IMPORT' | translate }}</a></li> -->
</ul>
</div>
<!-- Single button -->
Expand Down
2 changes: 1 addition & 1 deletion modules/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.mycontroller.standalone</groupId>
<artifactId>mycontroller-standalone-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -98,11 +98,14 @@ public Map<String, Object> getFilters() {
}

public static Query get(Map<String, Object> filters) {
Query query = Query.builder()
Query query = Query
.builder()
.order(filters.get(ORDER) != null ? (String) filters.get(ORDER) : ORDER_ASC)
.orderBy(filters.get(ORDER_BY) != null ? (String) filters.get(ORDER_BY) : KEY_ID)
.filters(filters)
.pageLimit(filters.get(PAGE_LIMIT) != null ? McUtils.getLong(filters.get(PAGE_LIMIT)) : MAX_ITEMS_PER_PAGE)
.pageLimit(
filters.get(PAGE_LIMIT) != null ? McUtils.getLong(filters.get(PAGE_LIMIT))
: MAX_ITEMS_PER_PAGE)
.page(filters.get(PAGE) != null ? (long) filters.get(PAGE) : 1L)
.isAndQuery(true)
.idColumn(KEY_ID)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 Jeeva Kandasamy ([email protected])
* Copyright 2015-2019 Jeeva Kandasamy ([email protected])
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<groupId>org.mycontroller.standalone</groupId>
<artifactId>mycontroller-standalone-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.5.0</version>
<url>https://github.com/mycontroller-org</url>
<inceptionYear>2015</inceptionYear>
<packaging>pom</packaging>
Expand Down

0 comments on commit 2aba103

Please sign in to comment.