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

@NoIssue

Browse Source 
Fixes incorrect i18n conflict resolutions.
This commit is contained in:
Leigh Johnson
2016-10-31 15:59:48 -04:00
parent f74a3c75de
commit d2ba01251f
5 changed files with 10 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$statePara
export function ProjectsAdd($scope, $rootScope, $compile, $location, $log, export function ProjectsAdd($scope, $rootScope, $compile, $location, $log,
$stateParams, GenerateForm, ProjectsForm, Rest, Alert, ProcessErrors, $stateParams, GenerateForm, ProjectsForm, Rest, Alert, ProcessErrors,
GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2) { GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2, i18n) {
var form = ProjectsForm(), var form = ProjectsForm(),
base = $location.path().replace(/^\//, '').split('/')[0], base = $location.path().replace(/^\//, '').split('/')[0],

1
awx/ui/client/src/forms/Credentials.js
View File

@@ -51,7 +51,6 @@ export default
list: 'OrganizationList', list: 'OrganizationList',
sourceModel: 'organization', sourceModel: 'organization',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookUpOrganization()',
awPopOver: i18n._("<p>If no organization is given, the credential can only be used by the user that creates the credential. Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.</p>"), awPopOver: i18n._("<p>If no organization is given, the credential can only be used by the user that creates the credential. Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.</p>"),
dataTitle: i18n._('Organization') + ' ', dataTitle: i18n._('Organization') + ' ',
dataPlacement: 'bottom', dataPlacement: 'bottom',

2
awx/ui/client/src/forms/Projects.js
View File

@@ -181,7 +181,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
}] }]
}, },
scm_update_cache_timeout: { scm_update_cache_timeout: {
label: i18n._('Cache Timeout<span class=\"small-text\"> (seconds)</span>'), label: i18n._(`Cache Timeout<span class="small-text"> (seconds)</span>`),
id: 'scm-cache-timeout', id: 'scm-cache-timeout',
type: 'number', type: 'number',
integer: true, integer: true,

12
awx/ui/client/src/inventories/main.js
View File

@@ -182,11 +182,13 @@ angular.module('inventory', [
edit: 'HostEditController' edit: 'HostEditController'
}, },
resolve: { resolve: {
host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) { edit: {
return HostManageService.get({ id: $stateParams.host_id }).then(function(res) { host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
return res.data.results[0]; return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
}); return res.data.results[0];
}] });
}]
}
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
label: "{{host.name}}", label: "{{host.name}}",

48
awx/ui/client/src/inventories/manage/hosts/main.js
View File

@@ -10,50 +10,4 @@ import HostsEditController from './hosts-edit.controller';
export default export default
angular.module('manageHosts', []) angular.module('manageHosts', [])
.controller('HostsAddController', HostsAddController) .controller('HostsAddController', HostsAddController)
.controller('HostEditController', HostsEditController) .controller('HostEditController', HostsEditController);
.config(['$stateProvider', 'stateDefinitionsProvider',
function($stateProvider, stateDefinitionsProvider) {
let addHost, editHost,
stateDefinitions = stateDefinitionsProvider.$get();
addHost = {
name: 'inventoryManage.addHost',
url: '/add-host',
lazyLoad: () => stateDefinitions.generateTree({
url: '/add-host',
name: 'inventoryManage.addHost',
modes: ['add'],
form: 'HostForm',
controllers: {
add: 'HostsAddController'
}
})
};
editHost = {
name: 'inventoryManage.editHost',
url: '/edit-host/:host_id',
ncyBreadcrumb: {
label: '{{host.name}}',
},
lazyLoad: () => stateDefinitions.generateTree({
url: '/edit-host/:host_id',
name: 'inventoryManage.editHost',
modes: ['edit'],
form: 'HostForm',
controllers: {
edit: 'HostEditController'
},
resolve: {
host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
return res.data.results[0];
});
}]
}
})
};
$stateProvider.state(addHost);
$stateProvider.state(editHost);
}
]);