Skip to content

Don't show deleted request message if not deleted #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 1 commit into from
Jan 28, 2016
Merged

Don't show deleted request message if not deleted #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SingularityUI/app/controllers/RequestDetail.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class RequestDetailController extends Controller
@subviews.requestHistoryMsg = new SimpleSubview
collection: @collections.requestHistory
template: @templates.requestHistoryMsg
extraRenderData: (subView) =>
{ request: @models.request.toJSON() }

@subviews.stats = new SimpleSubview
model: @models.activeDeployStats
Expand Down
40 changes: 21 additions & 19 deletions SingularityUI/app/templates/requestDetail/requestHistoryMsg.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{{! Part of requestBase }}

{{#ifEqual data.[0].eventType 'DELETED'}}
<div class="row detail-header">
<div class="col-md-12">
<h4>
<span class="request-state" data-state="DELETED">
Deleted
</span>
<span class="request-type">
{{humanizeText data.[0].request.requestType }}
</span>
</h4>
<h2>
{{ data.[0].request.id }}
</h2>
{{#unless request}}
{{#ifEqual data.[0].eventType 'DELETED'}}
<div class="row detail-header">
<div class="col-md-12">
<h4>
<span class="request-state" data-state="DELETED">
Deleted
</span>
<span class="request-type">
{{humanizeText data.[0].request.requestType }}
</span>
</h4>
<h2>
{{ data.[0].request.id }}
</h2>
</div>
</div>
</div>
<div class='alert alert-warning'>
<strong>Note: </strong>This request was deleted {{timestampFromNow data.[0].createdAt}}{{#if data.[0].user}}, by {{data.[0].user}}{{/if}}. All active and scheduled tasks will not run again unless it is reposted to Singularity.
</div>
{{/ifEqual}}
<div class='alert alert-warning'>
<strong>Note: </strong>This request was deleted {{timestampFromNow data.[0].createdAt}}{{#if data.[0].user}}, by {{data.[0].user}}{{/if}}. All active and scheduled tasks will not run again unless it is reposted to Singularity.
</div>
{{/ifEqual}}
{{/unless}}