openstack
/
designate-dashboard
Code Issues Proposed changes

Merge "Fix viewing detail resources"

This commit is contained in:
Jenkins 2017-09-20 02:11:14 +00:00 committed by Gerrit Code Review
parent 2a96ade71e a750ac77c2
commit 0524f79ad5
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
designatedashboard/static/designatedashboard/resources/os-designate-floatingip/os-designate-floatingip.module.js
View File

@ -45,6 +45,7 @@
}
run.$inject = [
'horizon.app.core.detailRoute',
'horizon.framework.conf.resource-type-registry.service',
'designatedashboard.resources.os-designate-floatingip.api',
'designatedashboard.resources.os-designate-floatingip.resourceType',
@ -52,6 +53,7 @@
];
function run(
detailRoute,
registry,
api,
resourceTypeString,
@ -97,7 +99,7 @@
id: 'address',
priority: 1,
sortDefault: true,
template: '<a ng-href="{$ \'project/ngdetails/OS::Designate::FloatingIp/\' + item.id $}">{$ item.address $}</a>'
template: '<a ng-href="{$ \'' + detailRoute + 'OS::Designate::FloatingIp/\' + item.id $}">{$ item.address $}</a>'
})
.append({
id: 'ptrdname',

6
designatedashboard/static/designatedashboard/resources/os-designate-recordset/os-designate-recordset.module.js
View File

@ -73,6 +73,7 @@
}
run.$inject = [
'horizon.app.core.detailRoute',
'horizon.framework.conf.resource-type-registry.service',
'designatedashboard.resources.os-designate-recordset.api',
'designatedashboard.resources.os-designate-recordset.resourceType',
@ -80,7 +81,8 @@
'designatedashboard.resources.util'
];
function run(registry,
function run(detailRoute,
registry,
recordSetApi,
resourceTypeString,
typeMap,
@ -160,7 +162,7 @@
sortDefault: true,
filters: ['noName'],
// For link format, see pathGenerator in details.module.js
template: '<a ng-href="{$ \'project/ngdetails/OS::Designate::RecordSet/\' + item.zone_id + \'/\' + item.id $}">{$ item.name $}</a>'
template: '<a ng-href="{$ \'' + detailRoute + 'OS::Designate::RecordSet/\' + item.zone_id + \'/\' + item.id $}">{$ item.name $}</a>'
})
.append({
id: 'type',

6
designatedashboard/static/designatedashboard/resources/os-designate-zone/os-designate-zone.module.js
View File

@ -45,13 +45,15 @@
}
run.$inject = [
'horizon.app.core.detailRoute',
'horizon.framework.conf.resource-type-registry.service',
'designatedashboard.resources.os-designate-zone.api',
'designatedashboard.resources.os-designate-zone.resourceType',
'designatedashboard.resources.util'
];
function run(registry,
function run(detailRoute,
registry,
zoneApi,
resourceTypeString,
util) {
@ -133,7 +135,7 @@
id: 'name',
priority: 1,
sortDefault: true,
template: '<a ng-href="{$ \'project/ngdetails/OS::Designate::Zone/\' + item.id $}">{$ item.name $}</a>'
template: '<a ng-href="{$ \'' + detailRoute + 'OS::Designate::Zone/\' + item.id $}">{$ item.name $}</a>'
})
.append({
id: 'type',