openstack
/
fuel-ui
Code Issues Proposed changes

Fetch dry run transactions 

Fetch transactions of both deployment and dry_run_deployment types.
Also, width of task details dialog is increased.

Partial-Bug: #1619733

Change-Id: Ifca4fcba9a12c7e09b93578aae909b1ba6d8b8c9
This commit is contained in:
Julia Aranovich 2016-09-06 12:13:45 +03:00 committed by Vitaly Kramskikh
parent f3c5293750
commit 8c82cd98d4
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/models.js
View File

@ -360,7 +360,9 @@ models.Cluster = BaseModel.extend({
collection.updateFetchOptions(() => {
if (key === 'deploymentGraphs') return {clusters_ids: this.id, fetch_related: 1};
var fetchOptions = {cluster_id: this.id};
if (key === 'transactions') fetchOptions.transaction_types = 'deployment';
if (key === 'transactions') {
fetchOptions.transaction_types = ['deployment', 'dry_run_deployment'].join(',');
}
return fetchOptions;
});
});
@ -605,6 +607,7 @@ models.Task = BaseModel.extend({
'deploy',
'provision',
'deployment',
'dry_run_deployment',
'reset_environment',
'spawn_vms'
]

37
static/styles/main.less
View File

@ -5265,26 +5265,29 @@ input[type=range] {
}
.deployment-task-details-dialog {
.modal-body {
max-height: 400px;
overflow-y: auto;
.row {
margin: 0;
margin-bottom: 2px;
color: @gray;
padding: 5px 0 8px 0;
border-bottom: 1px solid @base-light-color;
&:last-child {
border-bottom: 0;
.modal-dialog {
width: @page-width;
.modal-body {
max-height: 400px;
overflow-y: auto;
.row {
margin: 0;
margin-bottom: 2px;
color: @gray;
padding: 5px 0 8px 0;
border-bottom: 1px solid @base-light-color;
&:last-child {
border-bottom: 0;
}
> strong, > span {
display: inline-block;
.break-word;
}
}
> strong, > span {
display: inline-block;
.break-word;
.main-attribute {
color: @base-text-color;
}
}
.main-attribute {
color: @base-text-color;
}
}
}