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

removing more references to "Tower" in the code base

Browse Source
This commit is contained in:
Jared Tabor
2017-07-17 16:48:45 -07:00
parent 9449a0079f
commit f7f186e676
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/legacy-styles/ansible-ui.less
View File

@@ -276,7 +276,7 @@ i:active,
opacity: 0; opacity: 0;
} }
#configure-tower-dialog, #configure-schedules-form-container { #configure-dialog, #configure-schedules-form-container {
display: none; display: none;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;

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

@@ -8,8 +8,8 @@
import route from './about.route'; import route from './about.route';
export default export default
angular.module('aboutTower', []) angular.module('about', [])
.controller('aboutTower', controller) .controller('about', controller)
.run(['$stateExtender', function($stateExtender){ .run(['$stateExtender', function($stateExtender){
$stateExtender.addState(route); $stateExtender.addState(route);
}]); }]);

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

@@ -77,7 +77,7 @@ import '../lib/models';
import '../lib/services'; import '../lib/services';
import '../features'; import '../features';
var tower = angular.module('Tower', [ var app = angular.module('app', [
// how to add CommonJS / AMD third-party dependencies: // how to add CommonJS / AMD third-party dependencies:
// 1. npm install --save package-name // 1. npm install --save package-name
// 2. add package name to ./grunt-tasks/webpack.vendorFiles // 2. add package name to ./grunt-tasks/webpack.vendorFiles
@@ -460,4 +460,4 @@ var tower = angular.module('Tower', [
} }
]); ]);
export default tower; export default app;

2
awx/ui/client/src/credentials/factories/credential-form-save.factory.js
View File

@@ -65,7 +65,7 @@ export default
}) })
.error(function (data, status) { .error(function (data, status) {
Wait('stop'); Wait('stop');
// TODO: hopefully this conditional error handling will to away in a future version of tower. The reason why we cannot // TODO: hopefully this conditional error handling will to away in a future versions. The reason why we cannot
// simply pass this error to ProcessErrors is because it will actually match the form element 'ssh_key_unlock' and show // simply pass this error to ProcessErrors is because it will actually match the form element 'ssh_key_unlock' and show
// the error there. The ssh_key_unlock field is not shown when the kind of credential is gce/azure and as a result the // the error there. The ssh_key_unlock field is not shown when the kind of credential is gce/azure and as a result the
// error is never shown. In the future, the API will hopefully either behave or respond differently. // error is never shown. In the future, the API will hopefully either behave or respond differently.

2
awx/ui/client/src/footer/main.js
View File

@@ -8,4 +8,4 @@ import footerDirective from './footer.directive';
export default export default
angular.module('footer', []) angular.module('footer', [])
.directive('towerFooter', footerDirective); .directive('customFooter', footerDirective);

4
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -32,7 +32,7 @@
* that with the login form. Doing this each time the controller is instantiated insures the form is clean and not pre-populated with a prior user's username and password. * that with the login form. Doing this each time the controller is instantiated insures the form is clean and not pre-populated with a prior user's username and password.
* *
* Just before the release of 2.0 a bug was discovered where clicking logout and then immediately clicking login without providing a username and password would successfully log * Just before the release of 2.0 a bug was discovered where clicking logout and then immediately clicking login without providing a username and password would successfully log
* the user back into Tower. Implementing the above approach fixed this, forcing a new username/password to be entered each time the login dialog appears. * the user back into the app. Implementing the above approach fixed this, forcing a new username/password to be entered each time the login dialog appears.
* *
* #Login Workflow * #Login Workflow
* *
@@ -44,7 +44,7 @@
* - Get user informaton by calling Authorization.getUser() - sends a GET request to /api/v2/me * - Get user informaton by calling Authorization.getUser() - sends a GET request to /api/v2/me
* - Store user information in the session cookie by calling Authorization.setUser(). * - Store user information in the session cookie by calling Authorization.setUser().
* - Get the license by calling ConfigService.getConfig() - sends a GET request to /api/vi/config * - Get the license by calling ConfigService.getConfig() - sends a GET request to /api/vi/config
* - Stores the license object in memory by calling CheckLicense.test(). This adds the version and a tested flag to the license object. The tested flag is initially set to false. Additionally, the pendoService and FeaturesService are called to initiate the other startup services of Tower * - Stores the license object in memory by calling CheckLicense.test(). This adds the version and a tested flag to the license object. The tested flag is initially set to false. Additionally, the pendoService and FeaturesService are called to initiate the other startup services
* *
* Note that there is a session timer kept on the server side as well as the client side. Each time an API request is made, app.js calls * Note that there is a session timer kept on the server side as well as the client side. Each time an API request is made, app.js calls
* Timer.isExpired(). This verifies the UI does not think the session is expired, and if not, moves the expiration time into the future. The number of * Timer.isExpired(). This verifies the UI does not think the session is expired, and if not, moves the expiration time into the future. The number of

10
awx/ui/client/src/management-jobs/card/card.controller.js
View File

@@ -42,7 +42,7 @@ export default
// Cancel // Cancel
scope.cancelConfigure = function () { scope.cancelConfigure = function () {
try { try {
$('#configure-tower-dialog').dialog('close'); $('#configure-dialog').dialog('close');
$("#configure-save-button").remove(); $("#configure-save-button").remove();
} }
catch(e) { catch(e) {
@@ -131,7 +131,7 @@ export default
.success(function(data) { .success(function(data) {
Wait('stop'); Wait('stop');
$("#prompt-for-days-facts").dialog("close"); $("#prompt-for-days-facts").dialog("close");
$("#configure-tower-dialog").dialog('close'); $("#configure-dialog").dialog('close');
$state.go('managementJobStdout', {id: data.system_job}, {reload:true}); $state.go('managementJobStdout', {id: data.system_job}, {reload:true});
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -151,7 +151,7 @@ export default
scope.removePromptForDays(); scope.removePromptForDays();
} }
scope.removePromptForDays = scope.$on('PromptForDaysFacts', function() { scope.removePromptForDays = scope.$on('PromptForDaysFacts', function() {
// $('#configure-tower-dialog').dialog('close'); // $('#configure-dialog').dialog('close');
$('#prompt-for-days-facts').show(); $('#prompt-for-days-facts').show();
$('#prompt-for-days-facts').dialog('open'); $('#prompt-for-days-facts').dialog('open');
CreateSelect2({ CreateSelect2({
@@ -221,7 +221,7 @@ export default
.success(function(data) { .success(function(data) {
Wait('stop'); Wait('stop');
$("#prompt-for-days").dialog("close"); $("#prompt-for-days").dialog("close");
// $("#configure-tower-dialog").dialog('close'); // $("#configure-dialog").dialog('close');
$state.go('managementJobStdout', {id: data.system_job}, {reload:true}); $state.go('managementJobStdout', {id: data.system_job}, {reload:true});
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -241,7 +241,7 @@ export default
scope.removePromptForDays(); scope.removePromptForDays();
} }
scope.removePromptForDays = scope.$on('PromptForDays', function() { scope.removePromptForDays = scope.$on('PromptForDays', function() {
// $('#configure-tower-dialog').dialog('close'); // $('#configure-dialog').dialog('close');
$('#prompt-for-days').show(); $('#prompt-for-days').show();
$('#prompt-for-days').dialog('open'); $('#prompt-for-days').dialog('open');
Wait('stop'); Wait('stop');

2
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -98,7 +98,7 @@ export default
str = `ws-${data.group_name}-${data.ad_hoc_command}`; str = `ws-${data.group_name}-${data.ad_hoc_command}`;
} }
else if(data.group_name==="control"){ else if(data.group_name==="control"){
// As of Tower v. 3.1.0, there is only 1 "control" // As of v. 3.1.0, there is only 1 "control"
// message, which is for expiring the session if the // message, which is for expiring the session if the
// session limit is breached. // session limit is breached.
$log.debug(data.reason); $log.debug(data.reason);

4
awx/ui/templates/ui/index.html
View File

@@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
{% load i18n %} {% load i18n %}
<html lang="en" ng-app="Tower"> <html lang="en" ng-app="app">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@@ -173,7 +173,7 @@
<p>{% trans 'working...' %}</p> <p>{% trans 'working...' %}</p>
</div> </div>
</div> </div>
<tower-footer></tower-footer> <custom-footer></custom-footer>
</body> </body>
</html> </html>