Finishes admin widgets section.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/b6564ac6 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/b6564ac6 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/b6564ac6 Branch: refs/heads/angular Commit: b6564ac6a7896de92c00d868246ad784fa7bbbd3 Parents: 2da2bc1 Author: Jmeas <[email protected]> Authored: Wed Aug 27 10:35:10 2014 -0400 Committer: Jmeas <[email protected]> Committed: Wed Aug 27 10:35:10 2014 -0400 ---------------------------------------------------------------------- .../src/subapps/admin/users/routes.js | 5 ++++- .../admin/widgets/controllers/search-form.js | 4 +++- .../subapps/admin/widgets/controllers/widget.js | 4 ++-- .../admin/widgets/controllers/widgets.js | 8 ++++++-- .../src/subapps/admin/widgets/routes.js | 10 ++++++++-- .../admin/widgets/services/widgets-messages.js | 12 ++++++------ .../admin/widgets/templates/widgets.html | 20 +++++++++++--------- 7 files changed, 40 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/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 8d4aa54..15be070 100644 --- a/rave-portal-ng/src/subapps/admin/users/routes.js +++ b/rave-portal-ng/src/subapps/admin/users/routes.js @@ -45,7 +45,10 @@ define(function(require) { function(userResource, $stateParams) { return userResource.get({id: $stateParams.id}); }] - } + }, + onEnter: ['usersMessages', function(usersMessages) { + usersMessages.clearMessage(); + }], }) // Create a new account http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/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 483d5b7..38071f2 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 @@ -48,12 +48,14 @@ define(function(require) { }; $scope.search = function(options) { + options = options || {}; + var widgetsList = widgetsResource.get(options); widgetsList.$promise .then(function(response) { $scope.widgets = response.data; - if ($scope.resetFilter) { + if (!options.filter) { $scope.filter = ''; } http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/rave-portal-ng/src/subapps/admin/widgets/controllers/widget.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/controllers/widget.js b/rave-portal-ng/src/subapps/admin/widgets/controllers/widget.js index d9a49a2..d135bab 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/controllers/widget.js +++ b/rave-portal-ng/src/subapps/admin/widgets/controllers/widget.js @@ -77,7 +77,7 @@ define(function(require) { savedResource.$promise .then(function(response) { ctrl.updateList(response); - widgetsMessages.updateMessage(response.widgetname); + widgetsMessages.updateMessage(response.title); $state.transitionTo('portal.admin.widgets'); }) .catch(function(err) { @@ -93,7 +93,7 @@ define(function(require) { .then(function() { ctrl.removeFromList(); $('#confirm-modal').modal('hide'); - widgetsMessages.deleteMessage($scope.widget.widgetname); + widgetsMessages.deleteMessage($scope.widget.title); $state.transitionTo('portal.admin.widgets'); }) .catch(function() { http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/rave-portal-ng/src/subapps/admin/widgets/controllers/widgets.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/controllers/widgets.js b/rave-portal-ng/src/subapps/admin/widgets/controllers/widgets.js index 4e113b9..937d37f 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/controllers/widgets.js +++ b/rave-portal-ng/src/subapps/admin/widgets/controllers/widgets.js @@ -5,8 +5,8 @@ */ define(function(require) { - return ['$scope', '$stateParams', 'pagination', 'widgetsList', '$rootScope', - function($scope, $stateParams, pagination, widgetsList, $rootScope) { + return ['$scope', '$stateParams', 'pagination', 'widgetsList', '$rootScope', 'widgetsMessages', + function($scope, $stateParams, pagination, widgetsList, $rootScope, widgetsMessages) { $scope.currentPage = +$stateParams.page || 0; $scope.filter = $stateParams.filter || ''; @@ -40,5 +40,9 @@ define(function(require) { } return $scope.currentPage === $scope.widgetsMeta.pageCount ? 'disabled' : ''; }; + + $scope.showMessage = widgetsMessages.showMessage; + $scope.messageHtml = widgetsMessages.messageHtml; + $scope.messageClassName = widgetsMessages.messageClassName; }]; }); http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/rave-portal-ng/src/subapps/admin/widgets/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/routes.js b/rave-portal-ng/src/subapps/admin/widgets/routes.js index 9eed602..7222801 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/routes.js +++ b/rave-portal-ng/src/subapps/admin/widgets/routes.js @@ -27,7 +27,10 @@ define(function(require) { }); } ] - } + }, + onExit: ['widgetsMessages', function(widgetsMessages) { + widgetsMessages.clearMessage(); + }] }) .state('portal.admin.widgets.detail', { url: '/widget/:id', @@ -39,7 +42,10 @@ define(function(require) { function(widgetResource, $stateParams) { return widgetResource.get({id: $stateParams.id}); }] - } + }, + onEnter: ['widgetsMessages', function(widgetsMessages) { + widgetsMessages.clearMessage(); + }], }); } ]; http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/rave-portal-ng/src/subapps/admin/widgets/services/widgets-messages.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/services/widgets-messages.js b/rave-portal-ng/src/subapps/admin/widgets/services/widgets-messages.js index 1316337..24709d6 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/services/widgets-messages.js +++ b/rave-portal-ng/src/subapps/admin/widgets/services/widgets-messages.js @@ -12,18 +12,18 @@ define(function() { var className = ''; return { - createMessage: function(username) { - html = 'Created widget "<b>' + username + '</b>"'; + createMessage: function(widgetName) { + html = 'Created widget "<b>' + widgetName + '</b>"'; className = 'alert-success'; }, - updateMessage: function(username) { - html = 'Updated widget "<b>' + username + '</b>"'; + updateMessage: function(widgetName) { + html = 'Updated widget "<b>' + widgetName + '</b>"'; className = 'alert-success'; }, - deleteMessage: function(username) { - html = 'Deleted widget "<b>' + username + '</b>"'; + deleteMessage: function(widgetName) { + html = 'Deleted widget "<b>' + widgetName + '</b>"'; className = 'alert-success'; }, http://git-wip-us.apache.org/repos/asf/rave/blob/b6564ac6/rave-portal-ng/src/subapps/admin/widgets/templates/widgets.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/widgets/templates/widgets.html b/rave-portal-ng/src/subapps/admin/widgets/templates/widgets.html index 9ce731d..a64653b 100644 --- a/rave-portal-ng/src/subapps/admin/widgets/templates/widgets.html +++ b/rave-portal-ng/src/subapps/admin/widgets/templates/widgets.html @@ -1,5 +1,6 @@ <article ui-view> <form class="form-horizontal search-form" ng-controller="widgetSearchCtrl"> + <div class="alert" ng-class="messageClassName()" ng-bind-html="messageHtml()" ng-show="showMessage()"></div> <h2> Showing {{ widgetsMeta.start }} - {{ widgetsMeta.end }} of {{ widgetsMeta.totalUsers }} results </h2> @@ -19,16 +20,17 @@ </li> </ul> </div> - <form class="form-horizontal search-form" action="/portal/app/admin/widgets/search" method="get"> - <fieldset> - <div class="input-append"> - <input class="input-medium" type="search" id="searchTerm" name="searchTerm" value="" placeholder="Search Widgets" ng-model="filter"> - <button class="btn btn-primary" type="submit" value="Search" ng-click="search({filter:filter})">Search</button> - </div> - </fieldset> - </form> + <fieldset> + <div class="input-append"> + <input class="input-medium" type="search" id="searchTerm" name="searchTerm" value="" placeholder="Search Widgets" ng-model="filter"> + <button class="btn btn-primary" type="submit" value="Search" ng-click="search({filter:filter})">Search</button> + </div> + </fieldset> </div> - <table class="table table-striped table-bordered table-condensed"> + <div ng-show="!showResults()" class="alert alert-warning"> + 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> <tr> <th>Title</th>
