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

Fixed linting/leftover merge errors

Browse Source
This commit is contained in:
mabashian 2017-12-13 18:28:52 -05:00
parent 7eb2d86890
commit aefa30e1e9
No known key found for this signature in database
GPG Key ID: 436B8D5EDC704CE3
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/lib/models/Base.js
View File

@ -69,7 +69,7 @@ function search (params = {}, config = {}) {
};
if (typeof params === 'string') {
req.url = `?params`;
req.url = '?params';
} else if (Array.isArray(params)) {
req.url += `?${params.join('&')}`;
} else {

2
awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js
View File

@ -104,5 +104,5 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath,
export default ['$scope', 'HostsList', '$rootScope', 'GetBasePath',
'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait',
'HostsService', 'SetStatus', 'canAdd', '$transitions', 'InventoryHostsStrings'
'HostsService', 'SetStatus', 'canAdd', '$transitions', 'InventoryHostsStrings', HostsList
];

1
awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
View File

@ -120,7 +120,6 @@
$state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id});
};
$scope.deleteSource = function(inventory_source){
var body = '<div class=\"Prompt-bodyQuery\">' + i18n._('Confirm that you want to permanently delete the inventory source below from the inventory. Deleting this inventory source also deletes its associated groups and hosts.') + '</div><div class=\"Prompt-bodyTarget\">' + $filter('sanitize')(inventory_source.name) + '</div>';
var action = function(){
$rootScope.promptActionBtnClass = "Modal-errorButton--sourcesDelete";
Wait('start');