External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3922 from kensible/3921-pre-pr-issues

Browse Source 
Pre-pr fix and ui-router update
This commit is contained in:
kensible
2016-11-09 15:46:45 -05:00
committed by GitHub
parent 0d3eb67bd0 a071ca7173
commit d4d3c8117f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/configuration/configuration.route.js
View File

@@ -17,7 +17,12 @@
name: 'configuration', name: 'configuration',
route: '/configuration/:currentTab', route: '/configuration/:currentTab',
params: { params: {
currentTab: '' currentTab: {
value: 'auth',
dynamic: true,
isOptional: true
}
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
label: "Edit Configuration" label: "Edit Configuration"

2
awx/ui/client/src/configuration/configuration.service.js
View File

@@ -59,7 +59,7 @@ export default ['GetBasePath', 'ProcessErrors', '$q', '$http', 'Rest', '$rootSco
var deferred = $q.defer(); var deferred = $q.defer();
Rest.setUrl(url + '/all'); Rest.setUrl(url + '/all');
Rest.delete() Rest.destroy()
.success(function(data) { .success(function(data) {
deferred.resolve(data); deferred.resolve(data);
}) })