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

Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into JobDetailHostEvents

Browse Source
This commit is contained in:
Akita Noek
2016-06-01 15:06:11 -04:00
parent 37a7e0a862 5fd216f786
commit 3b1639da4f
7 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/unified_jobs.py
View File

@@ -754,8 +754,8 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
name=self.name, name=self.name,
url=self.get_ui_url(), url=self.get_ui_url(),
created_by=smart_text(self.created_by), created_by=smart_text(self.created_by),
started=self.started.isoformat(), started=self.started.isoformat() if self.started is not None else None,
finished=self.finished.isoformat(), finished=self.finished.isoformat() if self.finished is not None else None,
status=self.status, status=self.status,
traceback=self.result_traceback) traceback=self.result_traceback)

1
awx/settings/defaults.py
View File

@@ -540,6 +540,7 @@ EC2_REGION_NAMES = {
'ap-southeast-1': 'Asia Pacific (Singapore)', 'ap-southeast-1': 'Asia Pacific (Singapore)',
'ap-southeast-2': 'Asia Pacific (Sydney)', 'ap-southeast-2': 'Asia Pacific (Sydney)',
'ap-northeast-1': 'Asia Pacific (Tokyo)', 'ap-northeast-1': 'Asia Pacific (Tokyo)',
'ap-northeast-2': 'Asia Pacific (Seoul)',
'sa-east-1': 'South America (Sao Paulo)', 'sa-east-1': 'South America (Sao Paulo)',
'us-gov-west-1': 'US West (GovCloud)', 'us-gov-west-1': 'US West (GovCloud)',
'cn-north-1': 'China (Beijing)', 'cn-north-1': 'China (Beijing)',

3
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@@ -31,7 +31,8 @@ export default
scope.notification_type_options.forEach(function(type) { scope.notification_type_options.forEach(function(type) {
if (type.value === notification_template.notification_type) { if (type.value === notification_template.notification_type) {
scope.notification_templates[i].notification_type = type.label; scope.notification_templates[i].notification_type = type.label;
scope.notification_templates[i].status = notification_template.summary_fields.recent_notifications[0].status; var recent_notifications = notification_template.summary_fields.recent_notifications;
scope.notification_templates[i].status = recent_notifications && recent_notifications.length > 0 ? recent_notifications[0].status : "none";
} }
}); });
}); });

1
awx/ui/client/src/notifications/shared/type-change.service.js
View File

@@ -21,6 +21,7 @@ function () {
obj.port_required = false; obj.port_required = false;
obj.password_required = false; obj.password_required = false;
obj.channel_required = false; obj.channel_required = false;
obj.room_required = false;
switch (type) { switch (type) {
case 'email': case 'email':
obj.portLabel = ' Port'; obj.portLabel = ' Port';

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

@@ -109,8 +109,8 @@
<div class="Modal-body" ng-bind-html="promptBody" id="prompt-body"> <div class="Modal-body" ng-bind-html="promptBody" id="prompt-body">
</div> </div>
<div class="Modal-footer"> <div class="Modal-footer">
<a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
<a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a> <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
<a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
</div> </div>
</div><!-- modal-content --> </div><!-- modal-content -->
</div><!-- modal-dialog --> </div><!-- modal-dialog -->

2
requirements/requirements.txt
View File

@@ -5,7 +5,7 @@ appdirs==1.4.0
azure==2.0.0rc2 azure==2.0.0rc2
Babel==2.2.0 Babel==2.2.0
billiard==3.3.0.16 billiard==3.3.0.16
boto==2.39.0 boto==2.40.0
celery==3.1.10 celery==3.1.10
cliff==1.15.0 cliff==1.15.0
cmd2==0.6.8 cmd2==0.6.8

2
requirements/requirements_ansible.txt
View File

@@ -3,7 +3,7 @@ apache-libcloud==0.20.1
appdirs==1.4.0 appdirs==1.4.0
azure==2.0.0rc2 azure==2.0.0rc2
Babel==2.2.0 Babel==2.2.0
boto==2.34.0 boto==2.40.0
cliff==1.15.0 cliff==1.15.0
cmd2==0.6.8 cmd2==0.6.8
cryptography==1.3.2 cryptography==1.3.2