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

adding states for modular-ly defined routes

Browse Source
This commit is contained in:
Jared Tabor
2015-12-22 13:06:32 -08:00
parent c0b267b95a
commit 4bf357659f
14 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/adhoc/main.js
View File

@@ -2,11 +2,9 @@ import route from './adhoc.route';
import adhocController from './adhoc.controller'; import adhocController from './adhoc.controller';
import form from './adhoc.form'; import form from './adhoc.form';
export default angular.module('adhoc', ["ngRoute"]) export default angular.module('adhoc', [])
.controller('adhocController', adhocController) .controller('adhocController', adhocController)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]) }])
.factory('adhocForm', form); .factory('adhocForm', form);

2
awx/ui/client/src/controllers/Inventories.js
View File

@@ -862,7 +862,7 @@ export function InventoriesManage ($log, $scope, $rootScope, $location,
}); });
$scope.systemTracking = function() { $scope.systemTracking = function() {
transitionTo('systemTracking', $state.transitionTo('systemTracking',
{ inventory: $scope.inventory, { inventory: $scope.inventory,
hosts: $scope.hostsSelectedItems hosts: $scope.hostsSelectedItems
}); });

6
awx/ui/client/src/inventory-scripts/add/add.controller.js
View File

@@ -8,12 +8,12 @@ export default
[ '$compile','SchedulerInit', 'Rest', 'Wait', [ '$compile','SchedulerInit', 'Rest', 'Wait',
'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty', 'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty',
'GenerateForm', 'SearchInit' , 'PaginateInit', 'GenerateForm', 'SearchInit' , 'PaginateInit',
'LookUpInit', 'OrganizationList', '$scope', 'transitionTo', 'LookUpInit', 'OrganizationList', '$scope', '$state',
function( function(
$compile, SchedulerInit, Rest, Wait, $compile, SchedulerInit, Rest, Wait,
inventoryScriptsFormObject, ProcessErrors, GetBasePath, Empty, inventoryScriptsFormObject, ProcessErrors, GetBasePath, Empty,
GenerateForm, SearchInit, PaginateInit, GenerateForm, SearchInit, PaginateInit,
LookUpInit, OrganizationList, $scope, transitionTo LookUpInit, OrganizationList, $scope, $state
) { ) {
var scope = $scope, var scope = $scope,
generator = GenerateForm, generator = GenerateForm,
@@ -48,7 +48,7 @@ export default
script: scope.script script: scope.script
}) })
.success(function () { .success(function () {
transitionTo('inventoryScriptsList'); $state.transitionTo('inventoryScriptsList');
Wait('stop'); Wait('stop');
}) })

6
awx/ui/client/src/inventory-scripts/add/main.js
View File

@@ -10,8 +10,6 @@ import controller from './add.controller';
export default export default
angular.module('inventoryScriptsAdd', []) angular.module('inventoryScriptsAdd', [])
.controller('inventoryScriptsAddController', controller) .controller('inventoryScriptsAddController', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]); }]);

6
awx/ui/client/src/inventory-scripts/edit/edit.controller.js
View File

@@ -9,13 +9,13 @@ export default
'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath', 'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath',
'GenerateForm', 'SearchInit' , 'PaginateInit', 'GenerateForm', 'SearchInit' , 'PaginateInit',
'LookUpInit', 'OrganizationList', 'inventory_script', 'LookUpInit', 'OrganizationList', 'inventory_script',
'$scope', 'transitionTo', '$scope', '$state',
function( function(
Rest, Wait, Rest, Wait,
inventoryScriptsFormObject, ProcessErrors, GetBasePath, inventoryScriptsFormObject, ProcessErrors, GetBasePath,
GenerateForm, SearchInit, PaginateInit, GenerateForm, SearchInit, PaginateInit,
LookUpInit, OrganizationList, inventory_script, LookUpInit, OrganizationList, inventory_script,
$scope, transitionTo $scope, $state
) { ) {
var generator = GenerateForm, var generator = GenerateForm,
id = inventory_script.id, id = inventory_script.id,
@@ -80,7 +80,7 @@ export default
script: $scope.script script: $scope.script
}) })
.success(function () { .success(function () {
transitionTo('inventoryScriptsList'); $state.transitionTo('inventoryScriptsList');
Wait('stop'); Wait('stop');
}) })

6
awx/ui/client/src/inventory-scripts/edit/main.js
View File

@@ -10,8 +10,6 @@ import controller from './edit.controller';
export default export default
angular.module('inventoryScriptsEdit', []) angular.module('inventoryScriptsEdit', [])
.controller('inventoryScriptsEditController', controller) .controller('inventoryScriptsEditController', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]); }]);

10
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@@ -7,11 +7,11 @@
export default export default
[ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject', [ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject',
'GetBasePath' , 'SearchInit' , 'PaginateInit', 'GetBasePath' , 'SearchInit' , 'PaginateInit',
'Rest' , 'ProcessErrors', 'Prompt', 'transitionTo', 'Stream', 'Rest' , 'ProcessErrors', 'Prompt', '$state', 'Stream',
function( function(
$rootScope,Wait, GenerateList, inventoryScriptsListObject, $rootScope,Wait, GenerateList, inventoryScriptsListObject,
GetBasePath, SearchInit, PaginateInit, GetBasePath, SearchInit, PaginateInit,
Rest, ProcessErrors, Prompt, transitionTo, Stream Rest, ProcessErrors, Prompt, $state, Stream
) { ) {
var scope = $rootScope.$new(), var scope = $rootScope.$new(),
defaultUrl = GetBasePath('inventory_scripts'), defaultUrl = GetBasePath('inventory_scripts'),
@@ -38,8 +38,8 @@ export default
scope.search(list.iterator); scope.search(list.iterator);
scope.editCustomInv = function(){ scope.editCustomInv = function(){
transitionTo('inventoryScriptsEdit', { $state.transitionTo('inventoryScriptsEdit', {
inventory_script: this.inventory_script inventory_script: this.inventory_script.id
}); });
}; };
@@ -73,7 +73,7 @@ export default
}; };
scope.addCustomInv = function(){ scope.addCustomInv = function(){
transitionTo('inventoryScriptsAdd'); $state.transitionTo('inventoryScriptsAdd');
}; };
} }

8
awx/ui/client/src/inventory-scripts/list/main.js
View File

@@ -10,8 +10,6 @@ import controller from './list.controller';
export default export default
angular.module('inventoryScriptsList', []) angular.module('inventoryScriptsList', [])
.controller('inventoryScriptsListController', controller) .controller('inventoryScriptsListController', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route; }]);
$routeProvider.when(url, route);
}]);

6
awx/ui/client/src/login/main.js
View File

@@ -15,10 +15,4 @@ export default
.run(['$stateExtender', function($stateExtender) { .run(['$stateExtender', function($stateExtender) {
$stateExtender.addState(loginRoute); $stateExtender.addState(loginRoute);
$stateExtender.addState(logoutRoute); $stateExtender.addState(logoutRoute);
// var url = loginRoute.url;
// delete loginRoute.route;
// $routeProvider.when(url, loginRoute);
// url = logoutRoute.route;
// delete logoutRoute.route;
// $routeProvider.when(url, logoutRoute);
}]); }]);

6
awx/ui/client/src/management-jobs/list/list.controller.js
View File

@@ -11,12 +11,12 @@ export default
'GetBasePath' , 'SearchInit' , 'PaginateInit', 'GetBasePath' , 'SearchInit' , 'PaginateInit',
'SchedulesList', 'SchedulesList',
'Rest' , 'ProcessErrors', 'managementJobsListObject', '$rootScope', 'Rest' , 'ProcessErrors', 'managementJobsListObject', '$rootScope',
'transitionTo', 'Stream', '$state', 'Stream',
function( Wait, $location, $compile, CreateDialog, GenerateList, function( Wait, $location, $compile, CreateDialog, GenerateList,
GetBasePath, SearchInit, PaginateInit, GetBasePath, SearchInit, PaginateInit,
SchedulesList, SchedulesList,
Rest, ProcessErrors, managementJobsListObject, $rootScope, Rest, ProcessErrors, managementJobsListObject, $rootScope,
transitionTo, Stream) { $state, Stream) {
var scope = $rootScope.$new(), var scope = $rootScope.$new(),
parent_scope = scope, parent_scope = scope,
@@ -251,7 +251,7 @@ export default
}; };
scope.configureSchedule = function() { scope.configureSchedule = function() {
transitionTo('managementJobsSchedule', { $state.transitionTo('managementJobsSchedule', {
management_job: this.configure_job management_job: this.configure_job
}); });
}; };

6
awx/ui/client/src/management-jobs/list/main.js
View File

@@ -10,8 +10,6 @@ import controller from './list.controller';
export default export default
angular.module('managementJobsList', []) angular.module('managementJobsList', [])
.controller('managementJobsListController', controller) .controller('managementJobsListController', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]); }]);

6
awx/ui/client/src/management-jobs/schedule/main.js
View File

@@ -10,8 +10,6 @@ import controller from './schedule.controller';
export default export default
angular.module('managementJobsSchedule', []) angular.module('managementJobsSchedule', [])
.controller('managementJobsScheduleController', controller) .controller('managementJobsScheduleController', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]); }]);

14
awx/ui/client/src/setup-menu/setup-menu.partial.html
View File

@@ -1,6 +1,6 @@
<section id="htmlTemplate" class="Container"> <section id="htmlTemplate" class="Container">
<nav class="SetupMenu Container-main"> <nav class="SetupMenu Container-main">
<a link-to="credentials" class="SetupItem HoverIcon"> <a ui-sref="credentials" class="SetupItem HoverIcon">
<div class="Media"> <div class="Media">
<i class="SetupItem-icon SetupItem-icon--credentials HoverIcon-icon HoverIcon-icon--color Media-figure"> <i class="SetupItem-icon SetupItem-icon--credentials HoverIcon-icon HoverIcon-icon--color Media-figure">
<aw-icon name="Credentials"></aw-icon> <aw-icon name="Credentials"></aw-icon>
@@ -13,7 +13,7 @@
</div> </div>
</div> </div>
</a> </a>
<a link-to="users" class="SetupItem HoverIcon"> <a ui-sref="users" class="SetupItem HoverIcon">
<div class="Media"> <div class="Media">
<i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure"> <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
<aw-icon name="Users"></aw-icon> <aw-icon name="Users"></aw-icon>
@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
</a> </a>
<a link-to="teams" class="SetupItem HoverIcon"> <a ui-sref="teams" class="SetupItem HoverIcon">
<div class="Media"> <div class="Media">
<i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure"> <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
<aw-icon name="Teams"></aw-icon> <aw-icon name="Teams"></aw-icon>
@@ -42,7 +42,7 @@
</nav> </nav>
<aside class="Container-aside"> <aside class="Container-aside">
<nav class="SetupMenu Menu Menu--vertical"> <nav class="SetupMenu Menu Menu--vertical">
<a link-to="organizations" class="SetupItem SetupItem--aside HoverIcon Media"> <a ui-sref="organizations" class="SetupItem SetupItem--aside HoverIcon Media">
<i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside "> <i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside ">
<aw-icon name="Organizations"></aw-icon> <aw-icon name="Organizations"></aw-icon>
</i> </i>
@@ -53,7 +53,7 @@
</p> </p>
</div> </div>
</a> </a>
<a link-to="managementJobsList" class="SetupItem SetupItem--aside HoverIcon Media" ng-if="user_is_superuser"> <a ui-sref="managementJobsList" class="SetupItem SetupItem--aside HoverIcon Media" ng-if="user_is_superuser">
<i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside"> <i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside">
<aw-icon name="ManagementJobs"></aw-icon> <aw-icon name="ManagementJobs"></aw-icon>
</i> </i>
@@ -63,7 +63,7 @@
Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info. Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info.
</div> </div>
</a> </a>
<a link-to="inventoryScriptsList" class="SetupItem SetupItem--aside HoverIcon Media"> <a ui-sref="inventoryScriptsList" class="SetupItem SetupItem--aside HoverIcon Media">
<i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside "> <i class="HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--color Media-figure SetupItem-icon SetupItem-icon--aside ">
<aw-icon name="InventoryScripts"></aw-icon> <aw-icon name="InventoryScripts"></aw-icon>
</i> </i>
@@ -73,7 +73,7 @@
Create and edit scripts to dynamically load hosts from any source. Create and edit scripts to dynamically load hosts from any source.
</div> </div>
</a> </a>
<a link-to="license" class="SetupItem SetupItem--button SetupItem--aside SetupItem--noIcon"> <a ui-sref="license" class="SetupItem SetupItem--button SetupItem--aside SetupItem--noIcon">
<h4 class="SetupItem-title SetupItem-title--aside">View Your License</h4> <h4 class="SetupItem-title SetupItem-title--aside">View Your License</h4>
</a> </a>
<button ng-click="showAboutModal()" class="SetupItem SetupItem--button SetupItem--aside SetupItem--noIcon"> <button ng-click="showAboutModal()" class="SetupItem SetupItem--button SetupItem--aside SetupItem--noIcon">

6
awx/ui/client/src/system-tracking/main.js
View File

@@ -22,8 +22,6 @@ export default
dataServices.name dataServices.name
]) ])
.controller('systemTracking', controller) .controller('systemTracking', controller)
.config(['$routeProvider', function($routeProvider) { .run(['$stateExtender', function($stateExtender) {
var url = route.route; $stateExtender.addState(route);
delete route.route;
$routeProvider.when(url, route);
}]); }]);