demodalizing inventory scripts

and refactoring to use es6 modules
This commit is contained in:
Jared Tabor
2015-07-14 16:18:14 -04:00
parent ee6bc5dbfd
commit 4e6c97aa56
27 changed files with 578 additions and 502 deletions
+16 -11
View File
@@ -29,6 +29,7 @@ import {CredentialsAdd, CredentialsEdit, CredentialsList} from './controllers/Cr
import {JobsListController} from './controllers/Jobs';
import {PortalController} from './controllers/Portal';
import systemTracking from './system-tracking/main';
import inventoryScripts from './inventory-scripts/main';
import routeExtensions from './shared/route-extensions/main';
import breadcrumbs from './shared/breadcrumbs/main';
@@ -67,6 +68,7 @@ import './shared/Socket';
import './job-templates/main';
import './shared/features/main';
/*#if DEBUG#*/
import {__deferLoadIfEnabled} from './debug';
__deferLoadIfEnabled();
@@ -81,6 +83,7 @@ var tower = angular.module('Tower', [
browserData.name,
breadcrumbs.name,
systemTracking.name,
inventoryScripts.name,
setupMenu.name,
mainMenu.name,
dashboard.name,
@@ -104,7 +107,6 @@ var tower = angular.module('Tower', [
'PaginationHelpers',
'RefreshHelper',
'AdminListDefinition',
'CustomInventoryListDefinition',
'AWDirectives',
'AdhocFormDefinition',
'InventoriesListDefinition',
@@ -183,8 +185,6 @@ var tower = angular.module('Tower', [
'PortalJobsListDefinition',
'ConfigureTowerHelper',
'ConfigureTowerJobsListDefinition',
'CreateCustomInventoryHelper',
'CustomInventoryListDefinition',
'AdhocHelper',
'features',
'longDateFilter'
@@ -896,6 +896,17 @@ var tower = angular.module('Tower', [
}
}).
// when('/inventory_scripts', {
// name: 'inventoryScriptsList',
// templateUrl: urlPrefix + 'partials/inventory_scripts.html',
// controller: InventoryScriptsList,
// resolve: {
// features: ['FeaturesService', function(FeaturesService) {
// return FeaturesService.get();
// }]
// }
// }).
when('/license', {
name: 'license',
templateUrl: urlPrefix + 'partials/license.html',
@@ -933,9 +944,9 @@ var tower = angular.module('Tower', [
}])
.run(['$compile', '$cookieStore', '$rootScope', '$log', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'ClearScope', 'HideStream', 'Socket',
'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'ConfigureTower', 'CreateCustomInventory',
'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'ConfigureTower',
function ($compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, Timer, ClearScope, HideStream, Socket,
LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, ConfigureTower, CreateCustomInventory) {
LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, ConfigureTower) {
var sock;
@@ -1150,12 +1161,6 @@ var tower = angular.module('Tower', [
});
};
$rootScope.createCustomInv = function(){
CreateCustomInventory({
parent_scope: $rootScope
});
};
}); // end of 'ConfigReady'