Merge branch 'master' into issue-229

CHANGELOG.md

@@ -22,6 +22,7 @@ This release contains new migrations and requires to run the `migrate` command a
 
 ### Added
 
++ [#205](https://github.com/luyadev/luya-module-admin/issues/205) CRUD search works now in filters and relation calls, sorting and pagination works in searching.
 + [#216](https://github.com/luyadev/luya-module-admin/issues/216) File manager file detail view provides option to tag files.
 + [#259](https://github.com/luyadev/luya-module-admin/pull/259) SelectRelationActiveQuery supports related i18n label fields
 + [#253](https://github.com/luyadev/luya-module-admin/pull/253) Added command action to reset password for users via cli.

src/resources/js/controllers.js

@@ -264,8 +264,8 @@
  } else {
  cfpLoadingBar.start();
  $scope.searchPromise = $timeout(function() {
- $scope.generateSearchPromise(n, 1);
- }, 500)
+ $scope.reloadCrudList(1);
+ }, 700)
  }
  };
 
@@ -565,6 +565,11 @@
  if (pageId !== undefined) {
  url = url + '&page=' + pageId;
  }
+
+ var query = $scope.config.searchQuery;
+ if (query) {
+ url = url + '&query=' + query;
+ }
 
  return url;
  };
@@ -573,13 +578,17 @@
  $scope.reloadCrudList = function(pageId) {
  if (parseInt($scope.config.filter) == 0) {
 
+ /*
  if ($scope.config.searchQuery) {
  return $scope.generateSearchPromise($scope.config.searchQuery, pageId);
  }
+ */
 
  if ($scope.config.relationCall) {
  var url = $scope.generateUrlWithParams('relation-call', pageId);
  url = url + '&arrayIndex=' + $scope.config.relationCall.arrayIndex + '&id=' + $scope.config.relationCall.id + '&modelClass=' + $scope.config.relationCall.modelClass;
+ } else if ($scope.config.searchQuery) {
+ return $scope.generateSearchPromise($scope.config.searchQuery, pageId);
  } else {
  var url = $scope.generateUrlWithParams('list', pageId);
  }