Merge pull request #379 from HubSpot/hide_run_now

hide icon for run-now when daemon task
HubSpot · Jan 6, 2015 · 511b22e · 511b22e
2 parents 101f3e0 + 521aa2c
commit 511b22e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git 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
@@ -26,9 +26,11 @@
                         {{timestampFromNow pendingTask.pendingTaskId.nextRunAt}}
                     </td>
                     <td class="hidden-xs actions-column">
-                        <a data-action="run-now" title="Run now">
-                            <span class="glyphicon glyphicon-flash"></span>
-                        </a>
+                        {{#unless ../request.attributes.daemon}}
+                            <a data-action="run-now" title="Run now">
+                                <span class="glyphicon glyphicon-flash"></span>
+                            </a>
+                        {{/unless}}
                         <a data-action="viewJSON" title="JSON">
                             { }
                         </a>

diff --git a/SingularityUI/app/views/request.coffee b/SingularityUI/app/views/request.coffee
@@ -70,15 +70,15 @@ class RequestView extends View
     scaleRequest: (e) =>
         @model.promptScale =>
             @trigger 'refreshrequest'
-  
+
     pauseRequest: (e) =>
         @model.promptPause =>
             @trigger 'refreshrequest'
 
     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
@@ -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()