diff --git a/SingularityUI/app/controllers/RequestDetail.coffee b/SingularityUI/app/controllers/RequestDetail.coffee index 0d546817c0..c84ad5804f 100644 --- a/SingularityUI/app/controllers/RequestDetail.coffee +++ b/SingularityUI/app/controllers/RequestDetail.coffee @@ -65,8 +65,10 @@ class RequestDetailController extends Controller template: @templates.activeTasks @subviews.scheduledTasks = new SimpleSubview - collection: @collections.scheduledTasks - template: @templates.scheduledTasks + collection: @collections.scheduledTasks + template: @templates.scheduledTasks + extraRenderData: (subView) => + { request: @models.request.toJSON() } @subviews.taskHistory = new ExpandableTableSubview collection: @collections.taskHistory diff --git a/SingularityUI/app/templates/requestDetail/requestScheduledTasks.hbs b/SingularityUI/app/templates/requestDetail/requestScheduledTasks.hbs index e4bb13402b..584c095139 100644 --- a/SingularityUI/app/templates/requestDetail/requestScheduledTasks.hbs +++ b/SingularityUI/app/templates/requestDetail/requestScheduledTasks.hbs @@ -26,9 +26,11 @@ {{timestampFromNow pendingTask.pendingTaskId.nextRunAt}} - - - + {{#unless ../request.attributes.daemon}} + + + + {{/unless}} { } diff --git a/SingularityUI/app/views/request.coffee b/SingularityUI/app/views/request.coffee index ad763d33cf..eb52fbe216 100644 --- a/SingularityUI/app/views/request.coffee +++ b/SingularityUI/app/views/request.coffee @@ -70,7 +70,7 @@ class RequestView extends View scaleRequest: (e) => @model.promptScale => @trigger 'refreshrequest' - + pauseRequest: (e) => @model.promptPause => @trigger 'refreshrequest' @@ -78,7 +78,7 @@ class RequestView extends View unpauseRequest: (e) => @model.promptUnpause => @trigger 'refreshrequest' - + bounceRequest: (e) => @model.promptBounce => @trigger 'refreshrequest' diff --git a/SingularityUI/app/views/simpleSubview.coffee b/SingularityUI/app/views/simpleSubview.coffee index 5e7d7ff63b..375940ef9e 100644 --- a/SingularityUI/app/views/simpleSubview.coffee +++ b/SingularityUI/app/views/simpleSubview.coffee @@ -15,28 +15,36 @@ class SimpleSubview extends View _.extend super, 'click [data-action="expandToggle"]': 'expandToggle' - initialize: ({@template}) -> + initialize: (@params) -> + { @template } = @params @data = if @collection? then @collection else @model for eventName in ['sync', 'add', 'remove', 'change'] @listenTo @data, eventName, @render - + @listenTo @data, 'reset', => @$el.empty() render: -> return if not @data.synced and @data.isEmpty?() - - @$el.html @template - config: config - data: @data.toJSON() - synced: @data.synced - expanded: @expanded + + @$el.html @template(@renderData()) @$('.actions-column a[title]').tooltip() utils.setupCopyLinks @$el if @$('.horizontal-description-list').length + renderData: -> + data = + config: config + data: @data.toJSON() + synced: @data.synced + expanded: @expanded + if @params.extraRenderData? + _.extend data, @params.extraRenderData(this) + + data + expandToggle: (event) -> @expanded = not @expanded @render()