mirror of
https://github.com/ansible/awx.git
synced 2026-05-07 17:37:37 -02:30
AC-259 index.html looking for lib/LicenseView.js This was renamed to license.js.
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
.btn-success, .btn-danger, .btn-info, .btn-primary {
|
.btn-success, .btn-danger, .btn-info, .btn-primary {
|
||||||
padding-top: 1px;
|
padding-top: 1px;
|
||||||
padding-bottom: 1px;
|
padding-bottom: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn {
|
.btn {
|
||||||
|
|||||||
@@ -264,7 +264,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
|
|||||||
|
|
||||||
// Save changes to the parent
|
// Save changes to the parent
|
||||||
scope.formModalAction = function() {
|
scope.formModalAction = function() {
|
||||||
try {
|
try {
|
||||||
|
var refreshHosts = false;
|
||||||
|
|
||||||
// Make sure we have valid variable data
|
// Make sure we have valid variable data
|
||||||
if (scope.parseType == 'json') {
|
if (scope.parseType == 'json') {
|
||||||
@@ -284,6 +285,11 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
|
|||||||
data[fld] = scope[fld];
|
data[fld] = scope[fld];
|
||||||
}
|
}
|
||||||
data['inventory'] = inventory_id;
|
data['inventory'] = inventory_id;
|
||||||
|
|
||||||
|
if (master['description'] != data['description']) {
|
||||||
|
refreshHosts = true;
|
||||||
|
}
|
||||||
|
|
||||||
Rest.setUrl(defaultUrl);
|
Rest.setUrl(defaultUrl);
|
||||||
Rest.put(data)
|
Rest.put(data)
|
||||||
.success( function(data, status, headers, config) {
|
.success( function(data, status, headers, config) {
|
||||||
@@ -294,6 +300,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
|
|||||||
.success( function(data, status, headers, config) {
|
.success( function(data, status, headers, config) {
|
||||||
$('#form-modal').modal('hide');
|
$('#form-modal').modal('hide');
|
||||||
RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name'])
|
RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name'])
|
||||||
|
if (refreshHosts) {
|
||||||
|
scope.$emit('hostsReload');
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.error( function(data, status, headers, config) {
|
.error( function(data, status, headers, config) {
|
||||||
ProcessErrors(scope, data, status, form,
|
ProcessErrors(scope, data, status, form,
|
||||||
@@ -303,6 +312,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
|
|||||||
else {
|
else {
|
||||||
$('#form-modal').modal('hide');
|
$('#form-modal').modal('hide');
|
||||||
RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name']);
|
RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name']);
|
||||||
|
if (refreshHosts) {
|
||||||
|
scope.$emit('hostsReload');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.error( function(data, status, headers, config) {
|
.error( function(data, status, headers, config) {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ angular.module('AdminListDefinition', [])
|
|||||||
selectTitle: 'Add Administrators',
|
selectTitle: 'Add Administrators',
|
||||||
editTitle: 'Admins',
|
editTitle: 'Admins',
|
||||||
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
||||||
'Select button, located bottom right.</p>',
|
'<em>Select</em> button, located bottom right.</p>',
|
||||||
base: 'users',
|
base: 'users',
|
||||||
index: true,
|
index: true,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ angular.module('CredentialsListDefinition', [])
|
|||||||
selectTitle: 'Add Credentials',
|
selectTitle: 'Add Credentials',
|
||||||
editTitle: 'Credentials',
|
editTitle: 'Credentials',
|
||||||
selectInstructions: '<p>Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' +
|
||||||
'Select button, located bottom right.</p> <p>Create a brand new credential by clicking the green <i class=\"icon-plus\"></i>Create New button.</p>',
|
'<em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking the green <em>Create New</em> button.</p>',
|
||||||
editInstructions: 'Create a new credential from either the Teams tab or the Users tab. Teams and Users each have an associated set of Credentials.',
|
editInstructions: 'Create a new credential from either the Teams tab or the Users tab. Teams and Users each have an associated set of Credentials.',
|
||||||
index: true,
|
index: true,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ angular.module('GroupListDefinition', [])
|
|||||||
},
|
},
|
||||||
help: {
|
help: {
|
||||||
awPopOver: "Select groups by clicking on each group you wish to add. Add the selected groups to your inventory " +
|
awPopOver: "Select groups by clicking on each group you wish to add. Add the selected groups to your inventory " +
|
||||||
"or to the selected parent group by clicking the Select button. You can also create a new group by clicking the " +
|
"or to the selected parent group by clicking the <em>Select</em> button. You can also create a new group by clicking the " +
|
||||||
"Create New Group button.",
|
"<em>Create New Group</em> button.",
|
||||||
dataPlacement: 'left',
|
dataPlacement: 'left',
|
||||||
dataContainer: "#form-modal",
|
dataContainer: "#form-modal",
|
||||||
icon: "icon-question-sign",
|
icon: "icon-question-sign",
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ angular.module('HostListDefinition', [])
|
|||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
help: {
|
help: {
|
||||||
awPopOver: "Select hosts by clicking on each host you wish to add. Add the selected hosts to the group by clicking the Select button.",
|
awPopOver: "Select hosts by clicking on each host you wish to add. Add the selected hosts to the group by clicking the <em>Select</em> button.",
|
||||||
dataPlacement: 'left',
|
dataPlacement: 'left',
|
||||||
dataContainer: "#form-modal",
|
dataContainer: "#form-modal",
|
||||||
icon: "icon-question-sign",
|
icon: "icon-question-sign",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ angular.module('ProjectsListDefinition', [])
|
|||||||
selectTitle: 'Add Project',
|
selectTitle: 'Add Project',
|
||||||
editTitle: '{{ name }}',
|
editTitle: '{{ name }}',
|
||||||
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
|
||||||
'Select button, located bottom right.</p> <p>Create a brand new project by clicking the green <i class=\"icon-plus\"></i>Create New button.</p>',
|
'<em>Select</em> button, located bottom right.</p> <p>Create a brand new project by clicking the green <em>Create New</em> button.</p>',
|
||||||
index: true,
|
index: true,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ angular.module('UserListDefinition', [])
|
|||||||
selectTitle: 'Add Users',
|
selectTitle: 'Add Users',
|
||||||
editTitle: 'Users',
|
editTitle: 'Users',
|
||||||
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
||||||
'Select button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the green ' +
|
'<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the green ' +
|
||||||
'<i class=\"icon-plus\"></i>Create New button.</p>',
|
'<em>Create New</em> button.</p>',
|
||||||
index: true,
|
index: true,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
<script src="{{ STATIC_URL }}lib/ansible/directives.js"></script>
|
<script src="{{ STATIC_URL }}lib/ansible/directives.js"></script>
|
||||||
<script src="{{ STATIC_URL }}lib/ansible/filters.js"></script>
|
<script src="{{ STATIC_URL }}lib/ansible/filters.js"></script>
|
||||||
<script src="{{ STATIC_URL }}lib/ansible/api-loader.js"></script>
|
<script src="{{ STATIC_URL }}lib/ansible/api-loader.js"></script>
|
||||||
<script src="{{ STATIC_URL }}lib/ansible/LicenseView.js"></script>
|
<script src="{{ STATIC_URL }}lib/ansible/license.js"></script>
|
||||||
<script src="{{ STATIC_URL }}js/controllers/Authentication.js"></script>
|
<script src="{{ STATIC_URL }}js/controllers/Authentication.js"></script>
|
||||||
<script src="{{ STATIC_URL }}js/controllers/Organizations.js"></script>
|
<script src="{{ STATIC_URL }}js/controllers/Organizations.js"></script>
|
||||||
<script src="{{ STATIC_URL }}js/controllers/Users.js"></script>
|
<script src="{{ STATIC_URL }}js/controllers/Users.js"></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user