You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/08/13 17:11:20 UTC
[trafficcontrol] 01/12: moves ds static dns entries under the list
directory
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 99ff2740de5e6aca831d1aa2fa51a7e427cd8a0a
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Thu Jul 26 19:38:34 2018 -0600
moves ds static dns entries under the list directory
---
traffic_portal/app/src/app.js | 1 +
.../deliveryServiceStaticDnsEntries.tpl.html | 22 ++++++++++++++++++++++
.../deliveryServices/staticDnsEntries/index.js | 12 ++----------
.../staticDnsEntries/{ => list}/index.js | 8 ++++----
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/traffic_portal/app/src/app.js b/traffic_portal/app/src/app.js
index 7102880..41d548a 100644
--- a/traffic_portal/app/src/app.js
+++ b/traffic_portal/app/src/app.js
@@ -113,6 +113,7 @@ var trafficPortal = angular.module('trafficPortal', [
require('./modules/private/deliveryServices/regexes/new').name,
require('./modules/private/deliveryServices/servers').name,
require('./modules/private/deliveryServices/staticDnsEntries').name,
+ require('./modules/private/deliveryServices/staticDnsEntries/list').name,
require('./modules/private/deliveryServices/targets').name,
require('./modules/private/deliveryServices/targets/edit').name,
require('./modules/private/deliveryServices/targets/list').name,
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/deliveryServiceStaticDnsEntries.tpl.html b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/deliveryServiceStaticDnsEntries.tpl.html
new file mode 100644
index 0000000..36b9aad
--- /dev/null
+++ b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/deliveryServiceStaticDnsEntries.tpl.html
@@ -0,0 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div id="deliveryServiceStaticDnsEntriesContainer">
+ <div ui-view="deliveryServiceStaticDnsEntriesContent"></div>
+</div>
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js
index a43a684..cb554c5 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js
@@ -22,18 +22,10 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.staticDn
$stateProvider
.state('trafficPortal.private.deliveryServices.staticDnsEntries', {
url: '/{deliveryServiceId}/static-dns-entries',
+ abstract: true,
views: {
deliveryServicesContent: {
- templateUrl: 'common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html',
- controller: 'TableDeliveryServiceStaticDnsEntriesController',
- resolve: {
- deliveryService: function($stateParams, deliveryServiceService) {
- return deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
- },
- staticDnsEntries: function($stateParams, staticDnsEntryService) {
- return staticDnsEntryService.getStaticDnsEntries($stateParams.deliveryServiceId);
- }
- }
+ templateUrl: 'modules/private/deliveryServices/staticDnsEntries/deliveryServiceStaticDnsEntries.tpl.html'
}
}
})
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/list/index.js
similarity index 93%
copy from traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js
copy to traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/list/index.js
index a43a684..cfe4f8b 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/staticDnsEntries/list/index.js
@@ -17,13 +17,13 @@
* under the License.
*/
-module.exports = angular.module('trafficPortal.private.deliveryServices.staticDnsEntries', [])
+module.exports = angular.module('trafficPortal.private.deliveryServices.staticDnsEntries.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
- .state('trafficPortal.private.deliveryServices.staticDnsEntries', {
- url: '/{deliveryServiceId}/static-dns-entries',
+ .state('trafficPortal.private.deliveryServices.staticDnsEntries.list', {
+ url: '',
views: {
- deliveryServicesContent: {
+ deliveryServiceStaticDnsEntriesContent: {
templateUrl: 'common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html',
controller: 'TableDeliveryServiceStaticDnsEntriesController',
resolve: {