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 2017/07/27 21:16:08 UTC

[1/2] incubator-trafficcontrol git commit: This closes #760

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 11fb91a3f -> 8707132bc


This closes #760


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8707132b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8707132b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8707132b

Branch: refs/heads/master
Commit: 8707132bc42cc4e72384330ad4bd1615242e0abe
Parents: 4c11b19
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Jul 27 15:16:07 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Jul 27 15:16:07 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/2] incubator-trafficcontrol git commit: disables select all checkbox when results are filtered

Posted by de...@apache.org.
disables select all checkbox when results are filtered


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4c11b195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4c11b195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4c11b195

Branch: refs/heads/master
Commit: 4c11b195b3d534ba529022e4b71f28d8b5afe273
Parents: 11fb91a
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Jul 27 09:21:01 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Jul 27 15:16:07 2017 -0600

----------------------------------------------------------------------
 traffic_portal/app/src/common/api/TenantService.js       |  2 +-
 .../TableDSServersUnassignedController.js                | 10 +++++++++-
 .../table.dsServersUnassigned.tpl.html                   |  2 +-
 .../TableUserDSUnassignedController.js                   | 11 ++++++++++-
 .../userDeliveryServices/table.userDSUnassigned.tpl.html |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c11b195/traffic_portal/app/src/common/api/TenantService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/TenantService.js b/traffic_portal/app/src/common/api/TenantService.js
index b350033..80f6e88 100644
--- a/traffic_portal/app/src/common/api/TenantService.js
+++ b/traffic_portal/app/src/common/api/TenantService.js
@@ -34,7 +34,7 @@ var TenantService = function(Restangular, messageModel) {
                     messageModel.setMessages([ { level: 'success', text: 'Tenant created' } ], true);
                 },
                 function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
+                    messageModel.setMessages(fault.data.alerts, true);
                 }
         );
     };

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c11b195/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDSServersUnassignedController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDSServersUnassignedController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDSServersUnassignedController.js
index ac7c42f..e3c779b 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDSServersUnassignedController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDSServersUnassignedController.js
@@ -90,7 +90,7 @@ var TableDSServersUnassignedController = function(deliveryService, eligibleServe
 	};
 
 	angular.element(document).ready(function () {
-		$('#dsServersUnassignedTable').dataTable({
+		var dsServersUnassignedTable = $('#dsServersUnassignedTable').dataTable({
 			"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
 			"iDisplayLength": 25,
 			"order": [[ 1, 'asc' ]],
@@ -99,6 +99,14 @@ var TableDSServersUnassignedController = function(deliveryService, eligibleServe
 				{ "width": "5%", "targets": 0 }
 			]
 		});
+		dsServersUnassignedTable.on( 'search.dt', function () {
+			var search = $('#dsServersUnassignedTable_filter input').val();
+			if (search.length > 0) {
+				$("#selectAllCB").attr("disabled", true);
+			} else {
+				$("#selectAllCB").removeAttr("disabled");
+			}
+		} );
 	});
 
 };

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c11b195/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.dsServersUnassigned.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.dsServersUnassigned.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.dsServersUnassigned.tpl.html
index 7c15cf1..ff4b638 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.dsServersUnassigned.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.dsServersUnassigned.tpl.html
@@ -27,7 +27,7 @@ under the License.
     <table id="dsServersUnassignedTable" class="table responsive-utilities jambo_table" style="table-layout:fixed; width:100%;">
         <thead>
         <tr class="headings">
-            <th style="padding-left: 10px;"><input type="checkbox" ng-click="selectAll($event)" ng-checked="allSelected()"></th>
+            <th style="padding-left: 10px;"><input id="selectAllCB" type="checkbox" ng-click="selectAll($event)" ng-checked="allSelected()"></th>
             <th>hostName</th>
             <th>cachegroup</th>
             <th>profile</th>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c11b195/traffic_portal/app/src/common/modules/table/userDeliveryServices/TableUserDSUnassignedController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/userDeliveryServices/TableUserDSUnassignedController.js b/traffic_portal/app/src/common/modules/table/userDeliveryServices/TableUserDSUnassignedController.js
index 5e430f0..3486b76 100644
--- a/traffic_portal/app/src/common/modules/table/userDeliveryServices/TableUserDSUnassignedController.js
+++ b/traffic_portal/app/src/common/modules/table/userDeliveryServices/TableUserDSUnassignedController.js
@@ -90,7 +90,7 @@ var TableUserDSUnassignedController = function(user, deliveryServices, userDeliv
 	};
 
 	angular.element(document).ready(function () {
-		$('#userDSUnassignedTable').dataTable({
+		var userDSUnassignedTable = $('#userDSUnassignedTable').dataTable({
 			"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
 			"iDisplayLength": 25,
 			"order": [[ 1, 'asc' ]],
@@ -99,6 +99,15 @@ var TableUserDSUnassignedController = function(user, deliveryServices, userDeliv
 				{ "width": "5%", "targets": 0 }
 			]
 		});
+		userDSUnassignedTable.on( 'search.dt', function () {
+			var search = $('#userDSUnassignedTable_filter input').val();
+			if (search.length > 0) {
+				$("#selectAllCB").attr("disabled", true);
+			} else {
+				$("#selectAllCB").removeAttr("disabled");
+			}
+		} );
+
 	});
 
 };

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c11b195/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDSUnassigned.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDSUnassigned.tpl.html b/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDSUnassigned.tpl.html
index 58d9621..5348b33 100644
--- a/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDSUnassigned.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDSUnassigned.tpl.html
@@ -27,7 +27,7 @@ under the License.
     <table id="userDSUnassignedTable" class="table responsive-utilities jambo_table" style="table-layout:fixed; width:100%;">
         <thead>
         <tr class="headings">
-            <th style="padding-left: 10px;"><input type="checkbox" ng-click="selectAll($event)" ng-checked="allSelected()"></th>
+            <th style="padding-left: 10px;"><input id="selectAllCB" type="checkbox" ng-click="selectAll($event)" ng-checked="allSelected()"></th>
             <th>xmlId</th>
             <th>displayName</th>
         </tr>