Simplifies searching.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/855b3894 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/855b3894 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/855b3894 Branch: refs/heads/angular Commit: 855b3894e439bec947c66d96060d7312657831b3 Parents: 85a0193 Author: Jmeas <[email protected]> Authored: Wed Aug 27 11:06:23 2014 -0400 Committer: Jmeas <[email protected]> Committed: Wed Aug 27 11:06:23 2014 -0400 ---------------------------------------------------------------------- .../admin/users/controllers/search-form.js | 48 ++------------------ .../subapps/admin/users/controllers/users.js | 1 + .../src/subapps/admin/users/routes.js | 5 +- .../subapps/admin/users/templates/users.html | 4 +- .../admin/widgets/controllers/search-form.js | 23 +--------- 5 files changed, 12 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/855b3894/rave-portal-ng/src/subapps/admin/users/controllers/search-form.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/controllers/search-form.js b/rave-portal-ng/src/subapps/admin/users/controllers/search-form.js index 81c78de..16aeae2 100644 --- a/rave-portal-ng/src/subapps/admin/users/controllers/search-form.js +++ b/rave-portal-ng/src/subapps/admin/users/controllers/search-form.js @@ -8,8 +8,8 @@ define(function(require) { // Return the categories resource - return ['$scope', 'usersResource', 'pagination', - function($scope, usersResource, pagination) { + return ['$scope', 'usersResource', 'pagination', '$state', + function($scope, usersResource, pagination, $state) { // Our paginationPages $scope.paginationPages = pagination.paginationPages; @@ -47,47 +47,9 @@ define(function(require) { } }; - $scope.clearSearch = function() { - var usersList = usersResource.get(); - - usersList.$promise - .then(function(response) { - $scope.filter = ''; - $scope.users = response.data; - - var usersMeta = usersList.metadata; - - // Coerce each piece of metadata to a number. - _.each(usersMeta, function(val, key) { - usersMeta[key] = +val; - }); - - $scope.usersMeta = usersMeta; - }) - .catch(function() { - }); - }; - - $scope.search = function() { - var usersList = usersResource.get({ - filter: $scope.filter - }); - - usersList.$promise - .then(function(response) { - $scope.users = response.data; - - var usersMeta = usersList.metadata; - - // Coerce each piece of metadata to a number. - _.each(usersMeta, function(val, key) { - usersMeta[key] = +val; - }); - - $scope.usersMeta = usersMeta; - }) - .catch(function() { - }); + $scope.search = function(options) { + options = options || {}; + $state.transitionTo('portal.admin.users', {page:1, filter:options.filter}); }; }]; }); http://git-wip-us.apache.org/repos/asf/rave/blob/855b3894/rave-portal-ng/src/subapps/admin/users/controllers/users.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/controllers/users.js b/rave-portal-ng/src/subapps/admin/users/controllers/users.js index 5b629d7..662d399 100644 --- a/rave-portal-ng/src/subapps/admin/users/controllers/users.js +++ b/rave-portal-ng/src/subapps/admin/users/controllers/users.js @@ -8,6 +8,7 @@ define(function(require) { return ['$scope', '$stateParams', 'pagination', 'usersList', 'usersResource', 'usersMessages', function($scope, $stateParams, pagination, usersList, usersResource, usersMessages) { $scope.currentPage = +$stateParams.page || 0; + $scope.filter = $stateParams.filter || ''; usersList.$promise.then(function() { $scope.users = usersList.data; http://git-wip-us.apache.org/repos/asf/rave/blob/855b3894/rave-portal-ng/src/subapps/admin/users/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/routes.js b/rave-portal-ng/src/subapps/admin/users/routes.js index 15be070..68d1c26 100644 --- a/rave-portal-ng/src/subapps/admin/users/routes.js +++ b/rave-portal-ng/src/subapps/admin/users/routes.js @@ -17,7 +17,7 @@ define(function(require) { // The main state. Displays our list of users. .state('portal.admin.users', { - url: '/users?page', + url: '/users?page&filter', templateUrl: '/subapps/admin/users/templates/users.html', authenticate: true, controller: usersCtrl, @@ -28,7 +28,8 @@ define(function(require) { usersList: ['usersResource', '$stateParams', function(usersResource, $stateParams) { return usersResource.get({ - page: $stateParams.page + page: $stateParams.page, + filter: $stateParams.filter }); }] } http://git-wip-us.apache.org/repos/asf/rave/blob/855b3894/rave-portal-ng/src/subapps/admin/users/templates/users.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/templates/users.html b/rave-portal-ng/src/subapps/admin/users/templates/users.html index 2374a01..163567c 100644 --- a/rave-portal-ng/src/subapps/admin/users/templates/users.html +++ b/rave-portal-ng/src/subapps/admin/users/templates/users.html @@ -23,12 +23,12 @@ <fieldset> <div class="input-append"> <input class="input-medium" type="search" id="searchTerm" name="searchTerm" value="" placeholder="Search Users" ng-model="filter"> - <button class="btn btn-primary" ng-click="search()">Search</button> + <button class="btn btn-primary" ng-click="search({filter:filter})">Search</button> </div> </fieldset> </div> <div ng-show="!showResults()" class="alert alert-warning"> - There were no results. <a ng-click="clearSearch()" class="bold-link">Clear search.</a> + There were no results. <a ng-click="search()" class="bold-link">Clear search.</a> </div> <table class="table table-striped table-bordered table-condensed" ng-show="showResults()"> <thead> http://git-wip-us.apache.org/repos/asf/rave/blob/855b3894/rave-portal-ng/src/subapps/admin/widgets/controllers/search-form.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/controllers/search-form.js b/rave-portal-ng/src/subapps/admin/widgets/controllers/search-form.js index 38071f2..bcdf00d 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/controllers/search-form.js +++ b/rave-portal-ng/src/subapps/admin/widgets/controllers/search-form.js @@ -49,28 +49,7 @@ define(function(require) { $scope.search = function(options) { options = options || {}; - - var widgetsList = widgetsResource.get(options); - - widgetsList.$promise - .then(function(response) { - $scope.widgets = response.data; - if (!options.filter) { - $scope.filter = ''; - } - - var widgetsMeta = widgetsList.metadata; - - // Coerce each piece of metadata to a number. - _.each(widgetsMeta, function(val, key) { - widgetsMeta[key] = +val; - }); - - $scope.widgetsMeta = widgetsMeta; - $state.transitionTo('portal.admin.widgets', {page:1, filter:$scope.filter}); - }) - .catch(function() { - }); + $state.transitionTo('portal.admin.widgets', {page:1, filter:options.filter}); }; }]; });
