External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity

Putting list views and form views on same page

Browse Source 
for remaining CRUD pages
This commit is contained in:
Jared Tabor
2016-01-06 12:56:57 -05:00
parent efe62a093a
commit 414a5e2be0
17 changed files with 92 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/src/app.js
+20 -20
View File
@@ -371,8 +371,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('jobTemplateAdd', { state('jobTemplates.add', {
url: '/job_templates/add', url: '/add',
templateUrl: urlPrefix + 'partials/job_templates.html', templateUrl: urlPrefix + 'partials/job_templates.html',
controller: JobTemplatesAdd, controller: JobTemplatesAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -386,8 +386,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('jobTemplateEdit', { state('jobTemplates.edit', {
url: '/job_templates/:template_id', url: '/:template_id',
templateUrl: urlPrefix + 'partials/job_templates.html', templateUrl: urlPrefix + 'partials/job_templates.html',
controller: JobTemplatesEdit, controller: JobTemplatesEdit,
resolve: { resolve: {
@@ -569,8 +569,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('organizationsAdd', { state('organizations.add', {
url: '/organization/add', url: '/add',
templateUrl: urlPrefix + 'partials/organizations.html', templateUrl: urlPrefix + 'partials/organizations.html',
controller: OrganizationsAdd, controller: OrganizationsAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -584,8 +584,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('organizationEdit', { state('organizations.edit', {
url: '/organizations/:organization_id', url: '/:organization_id',
templateUrl: urlPrefix + 'partials/organizations.html', templateUrl: urlPrefix + 'partials/organizations.html',
controller: OrganizationsEdit, controller: OrganizationsEdit,
resolve: { resolve: {
@@ -654,8 +654,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('teamsAdd', { state('teams.add', {
url: '/teams/add', url: '/add',
templateUrl: urlPrefix + 'partials/teams.html', templateUrl: urlPrefix + 'partials/teams.html',
controller: TeamsAdd, controller: TeamsAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -669,8 +669,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('teamEdit', { state('teams.edit', {
url: '/teams/:team_id', url: '/:team_id',
templateUrl: urlPrefix + 'partials/teams.html', templateUrl: urlPrefix + 'partials/teams.html',
controller: TeamsEdit, controller: TeamsEdit,
resolve: { resolve: {
@@ -783,8 +783,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('credentialAdd', { state('credentials.add', {
url: '/credentials/add', url: '/add',
templateUrl: urlPrefix + 'partials/credentials.html', templateUrl: urlPrefix + 'partials/credentials.html',
controller: CredentialsAdd, controller: CredentialsAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -798,8 +798,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('credentialEdit', { state('credentials.edit', {
url: '/credentials/:credential_id', url: '/:credential_id',
templateUrl: urlPrefix + 'partials/credentials.html', templateUrl: urlPrefix + 'partials/credentials.html',
controller: CredentialsEdit, controller: CredentialsEdit,
resolve: { resolve: {
@@ -824,8 +824,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('userAdd', { state('users.add', {
url: '/users/add', url: '/add',
templateUrl: urlPrefix + 'partials/users.html', templateUrl: urlPrefix + 'partials/users.html',
controller: UsersAdd, controller: UsersAdd,
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -839,8 +839,8 @@ var tower = angular.module('Tower', [
} }
}). }).
state('userEdit', { state('users.edit', {
url: '/users/:user_id', url: '/:user_id',
templateUrl: urlPrefix + 'partials/users.html', templateUrl: urlPrefix + 'partials/users.html',
controller: UsersEdit, controller: UsersEdit,
resolve: { resolve: {
awx/ui/client/src/controllers/Credentials.js
+11 -8
View File
@@ -11,9 +11,10 @@
*/ */
export function CredentialsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, CredentialList, export function CredentialsList($scope, $rootScope, $location, $log,
GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, $stateParams, Rest, Alert, CredentialList, GenerateList, Prompt, SearchInit,
ClearScope, ProcessErrors, GetBasePath, SelectionInit, GetChoices, Wait, Stream) { PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
SelectionInit, GetChoices, Wait, Stream, $state) {
ClearScope(); ClearScope();
@@ -93,11 +94,11 @@ export function CredentialsList($scope, $rootScope, $location, $log, $stateParam
}; };
$scope.addCredential = function () { $scope.addCredential = function () {
$location.path($location.path() + '/add'); $state.transitionTo('credentials.add');
}; };
$scope.editCredential = function (id) { $scope.editCredential = function (id) {
$location.path($location.path() + '/' + id); $state.transitionTo('credentials.edit', {credential_id: id});
}; };
$scope.deleteCredential = function (id, name) { $scope.deleteCredential = function (id, name) {
@@ -124,9 +125,11 @@ export function CredentialsList($scope, $rootScope, $location, $log, $stateParam
}; };
} }
CredentialsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', CredentialsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', '$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', 'Prompt',
'SelectionInit', 'GetChoices', 'Wait', 'Stream' 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'GetChoices', 'Wait',
'Stream', '$state'
]; ];
awx/ui/client/src/controllers/JobTemplates.js
+13 -9
View File
@@ -11,9 +11,11 @@
*/ */
export function JobTemplatesList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, JobTemplateList, export function JobTemplatesList($scope, $rootScope, $location, $log,
GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, $stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt,
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun, Wait, Stream, CreateDialog, $compile) { SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors,
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun,
Wait, Stream, CreateDialog, $compile, $state) {
ClearScope(); ClearScope();
@@ -63,11 +65,11 @@ export function JobTemplatesList($scope, $rootScope, $location, $log, $statePara
}; };
$scope.addJobTemplate = function () { $scope.addJobTemplate = function () {
$location.path($location.path() + '/add'); $state.transitionTo('jobTemplates.add');
}; };
$scope.editJobTemplate = function (id) { $scope.editJobTemplate = function (id) {
$location.path($location.path() + '/' + id); $state.transitionTo('jobTemplates.edit', {template_id: id});
}; };
$scope.deleteJobTemplate = function (id, name) { $scope.deleteJobTemplate = function (id, name) {
@@ -235,10 +237,12 @@ export function JobTemplatesList($scope, $rootScope, $location, $log, $statePara
}; };
} }
JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'JobTemplateList', JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log',
'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', '$stateParams', 'Rest', 'Alert', 'JobTemplateList', 'generateList',
'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList', 'LookUpInit', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'PlaybookRun', 'Wait', 'Stream', 'CreateDialog' , '$compile' 'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList',
'LookUpInit', 'PlaybookRun', 'Wait', 'Stream', 'CreateDialog' , '$compile',
'$state'
]; ];
export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location, $log, $stateParams, JobTemplateForm, export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location, $log, $stateParams, JobTemplateForm,
awx/ui/client/src/controllers/Organizations.js
+11 -7
View File
@@ -11,8 +11,10 @@
*/ */
export function OrganizationsList($stateParams, $scope, $rootScope, $location, $log, Rest, Alert, Prompt, export function OrganizationsList($stateParams, $scope, $rootScope, $location,
GenerateList, OrganizationList, SearchInit, PaginateInit, ClearScope, ProcessErrors, GetBasePath, SelectionInit, Wait, Stream) { $log, Rest, Alert, Prompt, GenerateList, OrganizationList, SearchInit,
PaginateInit, ClearScope, ProcessErrors, GetBasePath, SelectionInit, Wait,
Stream, $state) {
ClearScope(); ClearScope();
@@ -59,11 +61,11 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, $
}; };
$scope.addOrganization = function () { $scope.addOrganization = function () {
$location.path($location.path() + '/add'); $state.transitionTo('organizations.add');
}; };
$scope.editOrganization = function (id) { $scope.editOrganization = function (id) {
$location.path($location.path() + '/' + id); $state.transitionTo('organizations.edit', {organization_id: id});
}; };
$scope.deleteOrganization = function (id, name) { $scope.deleteOrganization = function (id, name) {
@@ -91,9 +93,11 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, $
}; };
} }
OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope', '$location', '$log', 'Rest', 'Alert', 'Prompt', OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope',
'generateList', 'OrganizationList', 'SearchInit', 'PaginateInit', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$location', '$log', 'Rest', 'Alert', 'Prompt', 'generateList',
'Stream' 'OrganizationList', 'SearchInit', 'PaginateInit', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait',
'Stream', '$state'
]; ];
awx/ui/client/src/controllers/Teams.js
+11 -8
View File
@@ -11,9 +11,10 @@
*/ */
export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, TeamList, GenerateList, export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath, SelectionInit, Wait, Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit,
Stream) { ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath,
SelectionInit, Wait, Stream, $state) {
ClearScope(); ClearScope();
@@ -68,11 +69,11 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Res
}; };
$scope.addTeam = function () { $scope.addTeam = function () {
$location.path($location.path() + '/add'); $state.transitionTo('teams.add');
}; };
$scope.editTeam = function (id) { $scope.editTeam = function (id) {
$location.path($location.path() + '/' + id); $state.transitionTo('teams.edit', {team_id: id});
}; };
$scope.deleteTeam = function (id, name) { $scope.deleteTeam = function (id, name) {
@@ -105,9 +106,11 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Res
}; };
} }
TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', '$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt',
'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream' 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait',
'Stream', '$state'
]; ];
awx/ui/client/src/controllers/Users.js
+10 -7
View File
@@ -11,8 +11,10 @@
*/ */
export function UsersList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, UserList, GenerateList, export function UsersList($scope, $rootScope, $location, $log, $stateParams,
Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, Wait, Stream) { Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
Wait, Stream, $state) {
ClearScope(); ClearScope();
@@ -60,11 +62,11 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams, Res
}; };
$scope.addUser = function () { $scope.addUser = function () {
$location.path($location.path() + '/add'); $state.transitionTo('users.add');
}; };
$scope.editUser = function (id) { $scope.editUser = function (id) {
$location.path($location.path() + '/' + id); $state.transitionTo('users.edit', {user_id: id});
}; };
$scope.deleteUser = function (id, name) { $scope.deleteUser = function (id, name) {
@@ -95,9 +97,10 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams, Res
}; };
} }
UsersList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', '$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
'SelectionInit', 'Wait', 'Stream' 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream', '$state'
]; ];
awx/ui/client/src/inventory-scripts/add/add.route.js
+3 -3
View File
@@ -7,8 +7,8 @@
import {templateUrl} from '../../shared/template-url/template-url.factory'; import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'inventoryScriptsAdd', name: 'inventoryScripts.add',
route: '/inventory_scripts/add', route: '/add',
templateUrl: templateUrl('inventory-scripts/add/add'), templateUrl: templateUrl('inventory-scripts/add/add'),
controller: 'inventoryScriptsAddController', controller: 'inventoryScriptsAddController',
resolve: { resolve: {
@@ -17,7 +17,7 @@ export default {
}] }]
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'inventoryScriptsList', parent: 'inventoryScripts',
label: 'CREATE INVENTORY SCRIPT' label: 'CREATE INVENTORY SCRIPT'
} }
}; };
awx/ui/client/src/inventory-scripts/edit/edit.route.js
+2 -2
View File
@@ -7,8 +7,8 @@
import {templateUrl} from '../../shared/template-url/template-url.factory'; import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'inventoryScriptsEdit', name: 'inventoryScripts.edit',
route: '/inventory_scripts/:inventory_script_id', route: '/:inventory_script_id',
templateUrl: templateUrl('inventory-scripts/edit/edit'), templateUrl: templateUrl('inventory-scripts/edit/edit'),
controller: 'inventoryScriptsEditController', controller: 'inventoryScriptsEditController',
params: {inventory_script: null}, params: {inventory_script: null},
awx/ui/client/src/inventory-scripts/list/list.controller.js
+2 -2
View File
@@ -38,7 +38,7 @@ export default
scope.search(list.iterator); scope.search(list.iterator);
scope.editCustomInv = function(){ scope.editCustomInv = function(){
$state.transitionTo('inventoryScriptsEdit',{ $state.transitionTo('inventoryScripts.edit',{
inventory_script_id: this.inventory_script.id, inventory_script_id: this.inventory_script.id,
inventory_script: this.inventory_script inventory_script: this.inventory_script
}); });
@@ -74,7 +74,7 @@ export default
}; };
scope.addCustomInv = function(){ scope.addCustomInv = function(){
$state.transitionTo('inventoryScriptsAdd'); $state.transitionTo('inventoryScripts.add');
}; };
} }
awx/ui/client/src/inventory-scripts/list/list.partial.html
+1
View File
@@ -1,3 +1,4 @@
<div class="tab-pane" id="inventory_scripts"> <div class="tab-pane" id="inventory_scripts">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
</div> </div>
awx/ui/client/src/inventory-scripts/list/list.route.js
+1 -1
View File
@@ -7,7 +7,7 @@
import {templateUrl} from '../../shared/template-url/template-url.factory'; import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'inventoryScriptsList', name: 'inventoryScripts',
route: '/inventory_scripts', route: '/inventory_scripts',
templateUrl: templateUrl('inventory-scripts/list/list'), templateUrl: templateUrl('inventory-scripts/list/list'),
controller: 'inventoryScriptsListController', controller: 'inventoryScriptsListController',
awx/ui/client/src/partials/credentials.html
+1
View File
@@ -1,3 +1,4 @@
<div class="tab-pane" id="credentials"> <div class="tab-pane" id="credentials">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
</div> </div>
awx/ui/client/src/partials/job_templates.html
+1
View File
@@ -1,4 +1,5 @@
<div class="tab-pane" id="job_templates"> <div class="tab-pane" id="job_templates">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
<div ng-include="'/static/partials/schedule_dialog.html'"></div> <div ng-include="'/static/partials/schedule_dialog.html'"></div>
<div ng-include="'/static/partials/logviewer.html'"></div> <div ng-include="'/static/partials/logviewer.html'"></div>
awx/ui/client/src/partials/organizations.html
+1
View File
@@ -1,3 +1,4 @@
<div class="tab-pane" id="organizations"> <div class="tab-pane" id="organizations">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
</div> </div>
awx/ui/client/src/partials/teams.html
+1
View File
@@ -1,3 +1,4 @@
<div class="tab-pane" id="teams"> <div class="tab-pane" id="teams">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
</div> </div>
awx/ui/client/src/partials/users.html
+1
View File
@@ -1,3 +1,4 @@
<div class="tab-pane" id="users"> <div class="tab-pane" id="users">
<div ui-view></div>
<div ng-cloak id="htmlTemplate"></div> <div ng-cloak id="htmlTemplate"></div>
</div> </div>
awx/ui/client/src/setup-menu/setup-menu.partial.html
+1 -1
View File
@@ -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 ui-sref="inventoryScriptsList" class="SetupItem SetupItem--aside HoverIcon Media"> <a ui-sref="inventoryScripts" 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>