Import variables, parse, loadconfig in the correct place

This commit is contained in:
Michael Abashian
2017-03-01 16:43:28 -05:00
parent 0487b664ca
commit f174afb6df
2 changed files with 6 additions and 6 deletions

View File

@@ -70,9 +70,6 @@ import jobs from './jobs/main';
import teams from './teams/main'; import teams from './teams/main';
import users from './users/main'; import users from './users/main';
import projects from './projects/main'; import projects from './projects/main';
import variables from './shared/variables/main';
import parse from './shared/parse/main';
import loadconfig from './shared/load-config/main';
import RestServices from './rest/main'; import RestServices from './rest/main';
import access from './access/main'; import access from './access/main';
@@ -138,9 +135,6 @@ var tower = angular.module('Tower', [
teams.name, teams.name,
users.name, users.name,
projects.name, projects.name,
variables.name,
parse.name,
loadconfig.name,
//'templates', //'templates',
'Utilities', 'Utilities',
'OrganizationFormDefinition', 'OrganizationFormDefinition',

View File

@@ -20,6 +20,9 @@ import templateUrl from './template-url/main';
import RestServices from '../rest/main'; import RestServices from '../rest/main';
import stateDefinitions from './stateDefinitions.factory'; import stateDefinitions from './stateDefinitions.factory';
import apiLoader from './api-loader'; import apiLoader from './api-loader';
import variables from './variables/main';
import parse from './parse/main';
import loadconfig from './load-config/main';
import 'angular-duration-format'; import 'angular-duration-format';
export default export default
@@ -36,6 +39,9 @@ angular.module('shared', [listGenerator.name,
templateUrl.name, templateUrl.name,
RestServices.name, RestServices.name,
apiLoader.name, apiLoader.name,
variables.name,
parse.name,
loadconfig.name,
require('angular-cookies'), require('angular-cookies'),
'angular-duration-format' 'angular-duration-format'
]) ])