renames some methods associated with queuing updates on cdn servers
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7b5a66bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7b5a66bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7b5a66bb Branch: refs/heads/master Commit: 7b5a66bba241b4d76482445de5b2d5c532e40b5e Parents: 064b26b Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Thu Feb 16 19:36:28 2017 -0700 Committer: Dewayne Richardson <dewr...@apache.org> Committed: Fri Feb 17 08:33:17 2017 -0700 ---------------------------------------------------------------------- .../experimental/ui/app/src/common/api/CDNService.js | 8 ++++---- .../ui/app/src/common/modules/form/cdn/FormCDNController.js | 8 ++++---- .../ui/app/src/common/modules/form/cdn/form.cdn.tpl.html | 4 ++-- .../modules/table/cdnServers/TableCDNServersController.js | 8 ++++---- .../modules/table/cdnServers/table.cdnServers.tpl.html | 9 ++++++--- 5 files changed, 20 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b5a66bb/traffic_ops/experimental/ui/app/src/common/api/CDNService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js index 47f3606..d3f562d 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js @@ -64,11 +64,11 @@ var CDNService = function(Restangular, locationUtils, messageModel) { ); }; - this.queueCDNServers = function(id) { + this.queueServerUpdates = function(id) { return Restangular.one("cdns", id).customPOST( { action: "queue"}, "queue_update" ) .then( function() { - messageModel.setMessages([ { level: 'success', text: 'CDN servers queued' } ], false); + messageModel.setMessages([ { level: 'success', text: 'Queued CDN server updates' } ], false); }, function(fault) { messageModel.setMessages(fault.data.alerts, false); @@ -76,11 +76,11 @@ var CDNService = function(Restangular, locationUtils, messageModel) { ); }; - this.dequeueCDNServers = function(id) { + this.clearServerUpdates = function(id) { return Restangular.one("cdns", id).customPOST( { action: "dequeue"}, "queue_update" ) .then( function() { - messageModel.setMessages([ { level: 'success', text: 'CDN servers dequeued' } ], false); + messageModel.setMessages([ { level: 'success', text: 'Cleared CDN server updates' } ], false); }, function(fault) { messageModel.setMessages(fault.data.alerts, false); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b5a66bb/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js index 83f260a..d71e8ef 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js @@ -44,12 +44,12 @@ var FormCDNController = function(cdn, $scope, $location, formUtils, stringUtils, alert('not hooked up yet: cachegroupHealth for CDN'); }; - $scope.queueUpdates = function(cdn) { - cdnService.queueCDNServers(cdn.id); + $scope.queueServerUpdates = function(cdn) { + cdnService.queueServerUpdates(cdn.id); }; - $scope.dequeueUpdates = function() { - cdnService.dequeueCDNServers(cdn.id); + $scope.clearServerUpdates = function(cdn) { + cdnService.clearServerUpdates(cdn.id); }; $scope.manageSnapshots = function() { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b5a66bb/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html index 24c8a9e..4fd6463 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html @@ -25,8 +25,8 @@ under the License. </ol> <div class="pull-right" ng-show="!settings.isNew"> <button class="btn btn-primary" title="Snapshot {{cdn.name}} config" ng-click="manageSnapshots()"><i class="fa fa-camera"></i></button> - <button class="btn btn-danger" title="Queue {{cdn.name}} server updates" ng-click="queueUpdates(cdn)"><i class="fa fa-flag"></i></button> - <button class="btn btn-info" title="Dequeue {{cdn.name}} server updates" ng-click="dequeueUpdates()"><i class="fa fa-times"></i></button> + <button class="btn btn-danger" title="Queue {{cdn.name}} server updates" ng-click="queueServerUpdates(cdn)"><i class="fa fa-flag"></i></button> + <button class="btn btn-success" title="Clear {{cdn.name}} server updates" ng-click="clearServerUpdates(cdn)"><i class="fa fa-check"></i></button> <div class="btn-group" role="group" uib-dropdown is-open="more.isopen"> <button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false"> More http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b5a66bb/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js index 487265c..1c3d1e9 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js @@ -27,8 +27,8 @@ var TableCDNServersController = function(cdn, servers, $scope, $state, locationU locationUtils.navigateToPath('/configure/servers/' + id); }; - $scope.queueUpdates = function(cdn) { - cdnService.queueCDNServers(cdn.id) + $scope.queueServerUpdates = function(cdn) { + cdnService.queueServerUpdates(cdn.id) .then( function() { $scope.refresh(); @@ -36,8 +36,8 @@ var TableCDNServersController = function(cdn, servers, $scope, $state, locationU ); }; - $scope.dequeueUpdates = function(cdn) { - cdnService.dequeueCDNServers(cdn.id) + $scope.clearServerUpdates = function(cdn) { + cdnService.clearServerUpdates(cdn.id) .then( function() { $scope.refresh(); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b5a66bb/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html index 055f1e0..d3c0161 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html @@ -25,8 +25,8 @@ under the License. <li class="active">Servers</li> </ol> <div class="pull-right"> - <button class="btn btn-danger" title="Queue {{cdn.name}} server updates" ng-click="queueUpdates(cdn)"><i class="fa fa-flag"></i></button> - <button class="btn btn-info" title="Dequeue {{cdn.name}} server updates" ng-click="dequeueUpdates(cdn)"><i class="fa fa-times"></i></button> + <button class="btn btn-danger" title="Queue {{cdn.name}} server updates" ng-click="queueServerUpdates(cdn)"><i class="fa fa-flag"></i></button> + <button class="btn btn-success" title="Clear {{cdn.name}} server updates" ng-click="clearServerUpdates(cdn)"><i class="fa fa-check"></i></button> <button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button> </div> <div class="clearfix"></div> @@ -53,7 +53,10 @@ under the License. </thead> <tbody> <tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}"> - <td><i class="fa fa-flag" style="color: #d9534f;" ng-show="server.updPending"></i></td> + <td> + <i class="fa fa-flag" style="color: #d9534f;" ng-show="server.updPending"></i> + <i class="fa fa-check" style="color: #5cb85c;" ng-show="!server.updPending"></i> + </td> <td>{{server.hostName}}</td> <td>{{server.domainName}}</td> <td>{{server.cdnName}}</td>
