Skip to content

Commit

Permalink
Fixed issue #153
Browse files Browse the repository at this point in the history
  • Loading branch information
Zizzamia committed Aug 6, 2015
1 parent 65f9ad4 commit 79e2aee
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-tasty",
"version": "0.5.7",
"version": "0.5.8",
"homepage": "https://github.com/Zizzamia/ng-tasty",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-tasty",
"version": "0.5.7",
"version": "0.5.8",
"description": "A lightweight, flexible, and tasty collection of reusable UI components for AngularJS.",
"main": "dist/ng-tasty-tpls.min.js",
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion src/component/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,9 @@ angular.module('ngTasty.component.table', [
};
}
if (initNow || updateFrom === 'params') {
$scope.resourceCallback($scope.url, angular.copy($scope.params))
var paramsObj = angular.copy($scope.params);
paramsObj.filters = $scope.filters;
$scope.resourceCallback($scope.url, paramsObj)
.then(function (resource) {
setDirectivesValues(resource);
});
Expand Down
1 change: 1 addition & 0 deletions src/component/test/table-server-side.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ describe('Component: table server side', function () {
expect($scope.paramsObj.count).toEqual(5);
expect($scope.paramsObj.thead).toEqual(true);
expect($scope.paramsObj.pagination).toEqual(true);
expect($scope.paramsObj.filters.city).toEqual('sf');
});

it('should return a throw message if the response has the property header or rows defined', function () {
Expand Down

0 comments on commit 79e2aee

Please sign in to comment.