You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/02/21 18:27:49 UTC
[incubator-trafficcontrol] 33/33: as long as the ds request is
'open' it can be assigned/unassigned
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 1c457959cf807b1aa6b32c72c2992fe50b2e5597
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Tue Feb 20 13:42:24 2018 -0700
as long as the ds request is 'open' it can be assigned/unassigned
---
.../TableDeliveryServiceRequestsController.js | 4 ----
.../deliveryServiceRequests/table.deliveryServiceRequests.tpl.html | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
index b93ced2..c99782f 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
@@ -83,10 +83,6 @@ var TableDeliveryServicesRequestsController = function(dsRequests, $scope, $stat
return (request.status == 'rejected' || request.status == 'complete');
};
- $scope.assignable = function(request) {
- return (request.status == 'submitted');
- };
-
$scope.assignRequest = function(request, assign, $event) {
$event.stopPropagation(); // this kills the click event so it doesn't trigger anything else
var params = {
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
index 051f95c..0d5c9c5 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
@@ -53,9 +53,9 @@ under the License.
</td>
<td data-search="^{{::request.author}}$">{{::request.author}}</td>
<td data-search="^{{::request.assignee}}$">
- <span ng-show="!assignable(request)">{{::request.assignee}}</span>
- <a ng-show="assignable(request) && !request.assignee" class="link" title="Assign Yourself" ng-click="assignRequest(request, true, $event)">No one - assign yourself</a>
- <a ng-show="assignable(request) && request.assignee" class="link" title="Unassign" ng-click="assignRequest(request, false, $event)">{{::request.assignee}} - unassign</a>
+ <span ng-show="!open(request)">{{::request.assignee}}</span>
+ <a ng-show="open(request) && !request.assignee" class="link" title="Assign Yourself" ng-click="assignRequest(request, true, $event)">No one - assign yourself</a>
+ <a ng-show="open(request) && request.assignee" class="link" title="Unassign" ng-click="assignRequest(request, false, $event)">{{::request.assignee}} - unassign</a>
</td>
<td data-search="^{{::request.lastEditedBy}}$">{{::request.lastEditedBy}}</td>
<td title="{{request.createdAt}} (UTC)" data-search="^{{::getRelativeTime(request.createdAt)}}$" data-order="{{::request.createdAt}}">{{::getRelativeTime(request.createdAt)}}</td>
--
To stop receiving notification emails like this one, please contact
dewrich@apache.org.