External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Testing with nested views/states

Browse Source 
tested with inventories and projects pages
This commit is contained in:
Jared Tabor
2016-01-03 22:41:10 -05:00
parent 7a75f6d12a
commit f9f8083a5c
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/src/app.js
View File

@@ -428,9 +428,9 @@ var tower = angular.module('Tower', [
} }
}). }).
state('projectAdd', { state('projects.add', {
url: '/projects/add', url: '/add',
templateUrl: urlPrefix + 'partials/projects.html', templateUrl: urlPrefix + 'partials/projects.add.html',
controller: ProjectsAdd, controller: ProjectsAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
parent: "projects", parent: "projects",
@@ -443,8 +443,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('projectEdit', { state('projects.edit', {
url: '/projects/:id', url: '/:id',
templateUrl: urlPrefix + 'partials/projects.html', templateUrl: urlPrefix + 'partials/projects.html',
controller: ProjectsEdit, controller: ProjectsEdit,
resolve: { resolve: {
@@ -501,8 +501,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('inventoryAdd', { state('inventories.add', {
url: '/inventories/add', url: '/add',
templateUrl: urlPrefix + 'partials/inventories.html', templateUrl: urlPrefix + 'partials/inventories.html',
controller: InventoriesAdd, controller: InventoriesAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -516,8 +516,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('inventoryEdit', { state('inventories.edit', {
url: '/inventories/:inventory_id', url: '/:inventory_id',
templateUrl: urlPrefix + 'partials/inventories.html', templateUrl: urlPrefix + 'partials/inventories.html',
controller: InventoriesEdit, controller: InventoriesEdit,
resolve: { resolve: {

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

@@ -317,7 +317,8 @@ export function InventoriesList($scope, $rootScope, $location, $log,
}; };
$scope.editInventory = function (id) { $scope.editInventory = function (id) {
$location.path($location.path() + '/' + id); // $location.path($location.path() + '/' + id);
$state.go('inventories.edit', {inventory_id: id});
}; };
$scope.manageInventory = function(id){ $scope.manageInventory = function(id){

16
awx/ui/client/src/controllers/Projects.js
View File

@@ -11,9 +11,11 @@
*/ */
export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, ProjectList, GenerateList, LoadBreadCrumbs, export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, ProjectUpdate, Rest, Alert, ProjectList, GenerateList, LoadBreadCrumbs, Prompt, SearchInit,
Refresh, Wait, Stream, GetChoices, Empty, Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter) { PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
SelectionInit, ProjectUpdate, Refresh, Wait, Stream, GetChoices, Empty,
Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) {
ClearScope(); ClearScope();
@@ -197,11 +199,13 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
}; };
$scope.addProject = function () { $scope.addProject = function () {
$location.path($location.path() + '/add'); // $location.path($location.path() + '/add');
$state.transitionTo('projects.add');
}; };
$scope.editProject = function (id) { $scope.editProject = function (id) {
$location.path($location.path() + '/' + id); // $location.path($location.path() + '/' + id);
$state.transitionTo('projects.edit', {id: id});
}; };
if ($scope.removeShowLogViewer) { if ($scope.removeShowLogViewer) {
@@ -392,7 +396,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList', ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList',
'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath',
'SelectionInit', 'ProjectUpdate', 'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find', 'SelectionInit', 'ProjectUpdate', 'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find',
'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter' 'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state'
]; ];

1
awx/ui/client/src/partials/projects.add.html Normal file
View File

@@ -0,0 +1 @@
<div ng-cloak id="htmlTemplate"></div>

1
awx/ui/client/src/partials/projects.html
View File

@@ -1,4 +1,5 @@
<div class="tab-pane" id="projects"> <div class="tab-pane" id="projects">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
<div ng-include="'/static/partials/logviewer.html'"></div> <div ng-include="'/static/partials/logviewer.html'"></div>
<div ng-include="'/static/partials/schedule_dialog.html'"></div> <div ng-include="'/static/partials/schedule_dialog.html'"></div>