foreman_remote_execution 0.1.1 → 0.1.2

data/app/models/setting/remote_execution.rb

@@ -17,6 +17,12 @@ class Setting::RemoteExecution < Setting
         self.set('remote_execution_ssh_user',
                  N_("Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."),
                  'root'),
+        self.set('remote_execution_effective_user',
+                 N_("Default user to use for executing the script. If the user differs from the SSH user, su or sudo is used to switch the user."),
+                 'root'),
+        self.set('remote_execution_effective_user_method',
+                 N_("What command should be used to switch to the effective user. One of %s") % SSHExecutionProvider::EFFECTIVE_USER_METHODS.inspect,
+                 'sudo')
       ].each { |s| self.create! s.update(:category => "Setting::RemoteExecution") }
     end
 

data/app/models/ssh_execution_provider.rb

@@ -1,2 +1,39 @@
 class SSHExecutionProvider < RemoteExecutionProvider
+
+  EFFECTIVE_USER_METHODS = %w[sudo su]
+
+  class << self
+    def proxy_command_options(template_invocation, host)
+      super.merge(:ssh_user => ssh_user(host),
+                  :effective_user => effective_user(template_invocation),
+                  :effective_user_method => effective_user_method(host))
+    end
+
+    def humanized_name
+      _("Ssh")
+    end
+
+    def supports_effective_user?
+      true
+    end
+
+    private
+
+    def ssh_user(host)
+      host.params['remote_execution_ssh_user']
+    end
+
+    def effective_user(template_invocation)
+      template_invocation.effective_user
+    end
+
+    def effective_user_method(host)
+      method = host.params['remote_execution_effective_user_method'] || Setting[:remote_execution_effective_user_method]
+      unless EFFECTIVE_USER_METHODS.include?(method)
+        raise _('Effective user method "%{current_value}" is not one of %{valid_methods}') %
+                  { :current_value => method, :valid_methods => EFFECTIVE_USER_METHODS}
+      end
+      method
+    end
+  end
 end

data/app/models/targeting.rb

@@ -20,6 +20,19 @@ class Targeting < ActiveRecord::Base
 
   before_create :assign_search_query, :if => :static?
 
+  def clone
+    if static?
+      self.dup
+    else
+      Targeting.new(
+        :user => self.user,
+        :bookmark_id => self.bookmark.try(:id),
+        :targeting_type => self.targeting_type,
+        :search_query => self.search_query
+      )
+    end.tap(&:save)
+  end
+
   def resolve_hosts!
     raise ::Foreman::Exception, _('Cannot resolve hosts without a user') if user.nil?
     raise ::Foreman::Exception, _('Cannot resolve hosts without a bookmark or search query') if bookmark.nil? && search_query.blank?

data/app/models/template_input.rb

@@ -8,12 +8,15 @@ class TemplateInput < ActiveRecord::Base
             :puppet_parameter => N_('Puppet parameter') }.with_indifferent_access
 
   attr_accessible :name, :required, :input_type, :fact_name, :variable_name,
-                  :puppet_class_name, :puppet_parameter_name, :description, :job_template_id,
+                  :puppet_class_name, :puppet_parameter_name, :description, :template_id,
                   :options
 
   belongs_to :template
   has_many :template_invocation_input_values, :dependent => :destroy
 
+  scoped_search :on => :name, :complete_value => true
+  scoped_search :on => :input_type, :complete_value => true
+
   validates :name, :presence => true, :uniqueness => { :scope => 'template_id' }
   validates :input_type, :presence => true, :inclusion => TemplateInput::TYPES.keys
 

data/app/models/template_invocation.rb

@@ -1,4 +1,5 @@
 class TemplateInvocation < ActiveRecord::Base
+  include Authorizable
   include ForemanTasks::Concerns::ActionSubject
 
   include ForemanRemoteExecution::ErrorsFlattener
@@ -11,14 +12,28 @@ class TemplateInvocation < ActiveRecord::Base
   belongs_to :job_invocation, :inverse_of => :template_invocations
   has_many :input_values, :class_name => 'TemplateInvocationInputValue', :dependent => :destroy
   has_one :targeting, :through => :job_invocation
+  belongs_to :host, :class_name => 'Host::Managed', :foreign_key => :host_id
+  has_one :host_group, :through => :host, :source => :hostgroup
 
   validates_associated :input_values
   validate :provides_required_input_values
+  before_validation :set_effective_user
+
+  scoped_search :in => :host, :on => :name, :rename => 'host.name', :complete_value => true
+  scoped_search :in => :host_group, :on => :name, :rename => 'host_group.name', :complete_value => true
+  scoped_search :in => :template, :on => :job_name, :complete_value => true
 
   def to_action_input
     { :id => id, :name => template.name }
   end
 
+  def deep_clone
+    self.dup.tap do |invocation|
+      invocation.input_values = self.input_values.map(&:dup)
+      invocation.input_values.each(&:save!)
+    end
+  end
+
   private
 
   def provides_required_input_values
@@ -28,4 +43,12 @@ class TemplateInvocation < ActiveRecord::Base
       errors.add(:base, _("Not all required inputs have values. Missing inputs: %s") % missing_inputs.map(&:name).join(', '))
     end
   end
+
+  def set_effective_user
+    if template.provider.supports_effective_user?
+      self.effective_user = Setting[:remote_execution_effective_user] if self.effective_user.blank?
+    else
+      self.effective_user = nil
+    end
+  end
 end

data/app/views/api/v2/job_invocations/base.json.rabl

@@ -1,3 +1,7 @@
 object @job_invocation
 
 attributes :id, :job_name, :targeting_id
+
+child :task do
+  attributes :id, :state
+end

data/app/views/api/v2/job_invocations/index.json.rabl

@@ -1,3 +1,3 @@
 collection @job_invocations
 
-extends "api/v2/job_invocations/main"
+extends "api/v2/job_invocations/base"

data/app/views/api/v2/job_invocations/main.json.rabl

@@ -1,3 +1,22 @@
 object @job_invocation
 
 extends "api/v2/job_invocations/base"
+
+child :targeting do
+  attributes :bookmark_id, :search_query, :targeting_type, :user_id
+
+  child :hosts do
+    extends "api/v2/hosts/base"
+  end
+end
+
+child :task do
+  attributes :id, :state
+end
+
+child :template_invocations do
+  attributes :template_id, :template_name
+  child :input_values do
+    attributes :template_input_name, :template_input_id, :value
+  end
+end

data/app/views/api/v2/job_invocations/show.json.rabl

@@ -1,18 +1,3 @@
 object @job_invocation
 
 extends "api/v2/job_invocations/main"
-
-child :targeting do
-  attributes :bookmark_id, :search_query, :targeting_type, :user_id
-end
-
-child :last_task do
-  attributes :id, :state
-end
-
-child :template_invocations do
-  attributes :template_id
-  child :input_values do
-    attributes :template_input_id, :value
-  end
-end

data/app/views/api/v2/job_templates/base.json.rabl

@@ -1,3 +1,3 @@
 object @job_template
 
-attributes :id, :name, :job_name, :provider_type
+attributes :id, :name, :job_name, :provider_type, :snippet

data/app/views/api/v2/job_templates/index.json.rabl

@@ -1,3 +1,3 @@
 collection @job_templates
 
-extends "api/v2/job_templates/main"
+extends "api/v2/job_templates/base"

data/app/views/api/v2/job_templates/main.json.rabl

@@ -2,4 +2,8 @@ object @job_template
 
 extends "api/v2/job_templates/base"
 
-attributes :snippet, :audit_comment, :created_at, :updated_at
+attributes :audit_comment, :created_at, :updated_at
+
+child :template_inputs do
+  extends "api/v2/template_inputs/base"
+end

data/app/views/api/v2/job_templates/show.json.rabl

@@ -4,6 +4,10 @@ extends "api/v2/job_templates/main"
 
 attributes :template, :locked
 
+child :effective_user => :effective_user do
+  attributes :value, :current_user, :overridable
+end
+
 node do |job_template|
   partial("api/v2/taxonomies/children_nodes", :object => job_template)
 end

data/app/views/api/v2/job_templates/update.json.rabl

@@ -0,0 +1,3 @@
+object @job_template
+
+extends "api/v2/job_templates/show"

data/app/views/api/v2/template_inputs/base.json.rabl

@@ -0,0 +1,3 @@
+object @template_input
+
+attributes :id, :name, :input_type

data/app/views/api/v2/template_inputs/create.json.rabl

@@ -0,0 +1,3 @@
+object @template_input
+
+extends "api/v2/template_inputs/show"

data/app/views/api/v2/template_inputs/index.json.rabl

@@ -0,0 +1,3 @@
+collection @template_inputs
+
+extends "api/v2/template_inputs/main"

data/app/views/api/v2/template_inputs/main.json.rabl

@@ -0,0 +1,9 @@
+object @template_input
+
+extends "api/v2/template_inputs/base"
+
+attributes :template_id, :fact_name, :variable_name, :puppet_parameter_name
+
+node :options do |input|
+  input.options.split(/\r?\n/) if input.options.present?
+end

data/app/views/api/v2/template_inputs/show.json.rabl

@@ -0,0 +1,3 @@
+object @template_input
+
+extends "api/v2/template_inputs/main"

data/app/views/job_invocation_task_groups/_job_invocation_task_group.html.erb

@@ -0,0 +1,31 @@
+<% job_invocation = task_group.job_invocation %>
+<table class='table table-condensed'>
+  <tr>
+    <th>ID</th>
+    <td><%= link_to(job_invocation.id, job_invocation) %></td>
+  </tr>
+  <tr>
+    <th>Job Name</th>
+    <td><%= job_invocation.job_name %></td>
+  </tr>
+  <tr>
+    <th>Status</th>
+    <td><%= link_to_invocation_task_if_authorized(job_invocation) %></td>
+  </tr>
+  <tr>
+    <th>Succeeded</th>
+    <td><%= invocation_count(job_invocation, :output_key => :success_count) %></td>
+  </tr>
+  <tr>
+    <th>Failed</th>
+    <td><%= invocation_count(job_invocation, :output_key => :failed_count) %></td>
+  </tr>
+  <tr>
+    <th>Pending</th>
+    <td><%= invocation_count(job_invocation, :output_key => :pending_count) %></td>
+  </tr>
+  <tr>
+    <th>Total hosts</th>
+    <td><%= invocation_count(job_invocation, :output_key => :total_count) %></td>
+  </tr>
+</table>

data/app/views/job_invocation_task_groups/_job_invocation_task_groups.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to("#{task_groups.first.resource_name}: #{task_groups.count}x", job_invocations_path(:search => task_groups.first.class.search_query_for(source))) %>
+</li>

data/app/views/job_invocations/_form.html.erb

@@ -1,88 +1,119 @@
-<%= form_for @composer.job_invocation, :html => { 'data-refresh-url' => refresh_job_invocations_path, :id => 'job_invocation_form' } do |f| %>
-  <%= selectable_f f, :job_name, @composer.available_job_names %>
+<script type="text/javascript">
+  $(function () {
+    regenerate_description($('#description'), true)
+  });
+</script>
 
-  <%= fields_for @composer.targeting do |targeting_fields| %>
-    <span id="bookmark_query_map" >
-      <% @composer.available_bookmarks.each do |bookmark| %>
-        <span id="bookmark-<%= bookmark.id %>" data-query="<%= bookmark.query %>"></span>
-      <% end %>
-    </span>
-    <%= selectable_f targeting_fields, :bookmark_id, @composer.available_bookmarks.map {|b| [ b.name, b.id ] }, :selected => @composer.targeting.bookmark_id, :include_blank => true %>
-    <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5 %>
+<%= form_for @composer.job_invocation, :html => {'data-refresh-url' => refresh_job_invocations_path, :id => 'job_invocation_form'} do |f| %>
 
-    <div class="form-group ">
-      <label class="col-md-2 control-label"><%= _('Resolves to') %></label>
-      <div class="col-md-4">
-        <%= @composer.targeted_hosts_count %> <%= _('hosts') %>
-        <%= button_tag(:type => 'button', :class => 'btn btn-default btn-sm', :title => _("Refresh"), :id => 'refresh_execution_form') do %>
-          <%= icon_text('refresh') %>
-        <% end %>
-        <%= button_tag(:type => 'button', :class => 'btn btn-default btn-sm', :title => _("Preview"), :id => 'preview_hosts') do %>
-          <%= icon_text('eye-open') %>
-        <% end %>
-      </div>
-    </div>
+  <ul class="nav nav-tabs" data-tabs="tabs">
+    <li class="active"><a href="#primary" data-toggle="tab"><%= _('Job') %></a></li>
+    <li><a href="#scheduling" data-toggle="tab">Scheduling</a></li>
+  </ul>
 
-    <div class="form-group ">
-      <label class="col-md-2 control-label"><%= _('Type of query') %></label>
-      <div class="col-md-4">
-        <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::STATIC_TYPE, :text => _(Targeting::TYPES[Targeting::STATIC_TYPE]) %>
-        <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::DYNAMIC_TYPE, :text => _(Targeting::TYPES[Targeting::DYNAMIC_TYPE]) %>
-      </div>
-      <span class="help-inline"><%= popover(_('Explanation'),
-                                            _("Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>")) %></span>
-    </div>
-  <% end %>
+  <div class="tab-content">
+    <div class="tab-pane active" id="primary">
+      <%= selectable_f f, :job_name, @composer.available_job_names %>
+
+      <%= fields_for @composer.targeting do |targeting_fields| %>
+        <span id="bookmark_query_map">
+          <% @composer.available_bookmarks.each do |bookmark| %>
+            <span id="bookmark-<%= bookmark.id %>" data-query="<%= bookmark.query %>"></span>
+          <% end %>
+        </span>
+        <%= selectable_f targeting_fields, :bookmark_id, @composer.available_bookmarks.map { |b| [b.name, b.id] }, :selected => @composer.targeting.bookmark_id, :include_blank => true %>
+        <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5 %>
 
-  <% @composer.displayed_provider_types.each do |provider_type| %>
-    <fieldset id="provider_<%= provider_type %>" class="provider_form">
-      <legend><%= _('Provider') + ': ' + provider_type %></legend>
-      <%= f.fields_for 'providers' do |providers_fields| %>
-        <%= providers_fields.fields_for provider_type do |provider_type_fields| %>
-          <%= provider_type_fields.fields_for :job_templates do |job_templates_fields| %>
-            <% if @composer.needs_provider_type_selection? %>
-              <%= radio_button_f provider_type_fields, 'job_template_id', :value => '', :text => _('Disable this provider'),
-                                 :class => 'job_template_selector', :checked => @composer.preselect_disabled_for_provider(provider_type) %>
-              <span />
+        <div class="form-group ">
+          <label class="col-md-2 control-label"><%= _('Resolves to') %></label>
+
+          <div class="col-md-4">
+            <%= @composer.targeted_hosts_count %> <%= _('hosts') %>
+            <%= button_tag(:type => 'button', :class => 'btn btn-default btn-sm', :title => _("Refresh"), :id => 'refresh_execution_form') do %>
+              <%= icon_text('refresh') %>
+            <% end %>
+            <%= button_tag(:type => 'button', :class => 'btn btn-default btn-sm', :title => _("Preview"), :id => 'preview_hosts') do %>
+              <%= icon_text('eye-open') %>
             <% end %>
-            <% @composer.templates_for_provider(provider_type).each do |job_template| %>
-              <%= radio_button_f provider_type_fields, 'job_template_id',
-                                 :value => job_template.id,
-                                 :text => job_template.name,
-                                 :class => 'job_template_selector',
-                                 :checked => @composer.job_template_ids.include?(job_template.id) || @composer.only_one_template_available? %>
+          </div>
+        </div>
+
+        <div class="form-group ">
+          <label class="col-md-2 control-label"><%= _('Type of query') %></label>
+
+          <div class="col-md-4">
+            <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::STATIC_TYPE, :text => _(Targeting::TYPES[Targeting::STATIC_TYPE]) %>
+            <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::DYNAMIC_TYPE, :text => _(Targeting::TYPES[Targeting::DYNAMIC_TYPE]) %>
+          </div>
+	  <span class="help-inline"><%= popover(_('Explanation'),
+                                          _("Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>")) %></span>
+        </div>
+      <% end %>
 
-              <fieldset id="job_template_<%= job_template.id %>" class="job_template_form <%= 'hidden' if !@composer.job_template_ids.include?(job_template.id) && !@composer.only_one_template_available? %>">
-                <%= job_templates_fields.fields_for job_template.id.to_s do |job_template_fields| %>
-                  <%= job_template_fields.fields_for :input_values do |input_values_fields| %>
-                    <% job_template.template_inputs.where(:input_type => 'user').each do |input| %>
-                      <%= input_values_fields.fields_for input.id.to_s, @composer.template_invocation_input_value_for(input) do |input_fields| %>
-                        <% unless input.options.blank? %>
-                          <%= selectable_f input_fields, :value, input.options_array, {:include_blank => !input.required }, :require => input.required, :label => input.name, :help_inline => input.description %>
-                        <% else %>
-                          <%= textarea_f input_fields, :value, :label => input.name, :help_inline => input.description, :required => input.required, :rows => 2 %>
+      <% @composer.displayed_provider_types.each do |provider_type| %>
+        <fieldset id="provider_<%= provider_type %>" class="provider_form">
+          <legend><%= _('Provider') + ': ' + provider_type %></legend>
+          <%= f.fields_for 'providers' do |providers_fields| %>
+            <%= providers_fields.fields_for provider_type do |provider_type_fields| %>
+              <%= provider_type_fields.fields_for :job_templates do |job_templates_fields| %>
+                <% if @composer.needs_provider_type_selection? %>
+                  <%= radio_button_f provider_type_fields, 'job_template_id', :value => '', :text => _('Disable this provider'),
+                                     :class => 'job_template_selector', :checked => @composer.preselect_disabled_for_provider(provider_type) %>
+                  <span/>
+                <% end %>
+                <% @composer.templates_for_provider(provider_type).each do |job_template| %>
+                  <%= radio_button_f provider_type_fields, 'job_template_id',
+                                     :value => job_template.id,
+                                     :text => job_template.name,
+                                     :onchange => "regenerate_description($(this).parent().next('fieldset'));",
+                                     :class => 'job_template_selector',
+                                     :checked => @composer.job_template_ids.include?(job_template.id) || @composer.only_one_template_available? %>
+
+                  <fieldset id="job_template_<%= job_template.id %>" class="job_template_form <%= 'hidden' if !@composer.job_template_ids.include?(job_template.id) && !@composer.only_one_template_available? %>">
+                    <%= job_templates_fields.fields_for job_template.id.to_s do |job_template_fields| %>
+
+                      <%= job_template_fields.fields_for :input_values do |input_values_fields| %>
+                        <% job_template.template_inputs.where(:input_type => 'user').each do |input| %>
+                          <%= input_values_fields.fields_for input.id.to_s, @composer.template_invocation_input_value_for(input) do |input_fields| %>
+                            <% unless input.options.blank? %>
+                              <%= selectable_f input_fields, :value, input.options_array, {:include_blank => !input.required}, :require => input.required, :label => input.name, :help_inline => input.description, :id => input.name, :onchange => "regenerate_description(this);" %>
+                            <% else %>
+                              <%= textarea_f input_fields, :value, :label => input.name, :help_inline => input.description, :required => input.required, :rows => 2, :onchange => "regenerate_description(this);", :id => input.name %>
+                            <% end %>
+                          <% end %>
                         <% end %>
                       <% end %>
+                      <% if job_template.effective_user.overridable? %>
+                        <%= text_f job_template_fields, :effective_user, :label => _('Effective user'), :help_inline => N_("A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts.") %>
+                      <% end %>
+
                     <% end %>
-                  <% end %>
+                    <%= textarea_f f, :description, :label => _("Description"), :readonly => "true", :id => "description", :rows => 2, :help_inline => content_tag(:span, check_box_tag('description_format_override', job_template.generate_description_format, true, :onchange => "description_override(this);") + ' ' + _("Use default description template")) %>
+                    <div id="description_format_container" class="hidden">
+                      <%= textarea_f f, :description_format,
+                                     :label => _("Description template"),
+                                     :value => job_template.generate_description_format,
+                                     :rows => 2,
+                                     :onchange => "regenerate_description(this);",
+                                     :id => "description_format",
+                                     :help_inline => popover(_('Explanation'), _('Description template determines the job name once it is submitted. Input values can become part of the name
+                         if they are specified using interpolation syntax, e.g. %{fqdn} where fqdn is the name of interpolated input.')) %>
+                    </div>
+                  </fieldset>
                 <% end %>
-              </fieldset>
+              <% end %>
             <% end %>
           <% end %>
-        <% end %>
+        </fieldset>
       <% end %>
-    </fieldset>
-  <% end %>
 
-  <div class="form-group trigger_mode">
-    <legend><%= _('Schedule Job') %></legend>
-    <%= radio_button_f f, :trigger_mode, :value => 'immediate', :text => _("Run Job Now"), :class => 'trigger_mode_selector' %>
-    <%= radio_button_f f, :trigger_mode, :value => 'future', :text => _("Schedule Future Job"), :class => 'trigger_mode_selector' %>
-    <fieldset id="trigger_mode_future" class="trigger_mode_form <%= 'hidden' if @composer.job_invocation.trigger_mode != :future %>">
-      <%= text_f f, :start_at, :label => _('Start at') %>
-      <%= text_f f, :start_before, :label => _('Start before') %>
-    </fieldset>
+      <%= render :partial => 'preview_hosts_modal' %>
+    </div>
+
+    <div class="tab-pane" id="scheduling">
+      <%= trigger_selector f, @composer.triggering %>
+    </div>
   </div>
-  <%= render :partial => 'preview_hosts_modal' %>
+
   <%= submit_or_cancel f %>
 <% end %>

data/app/views/job_invocations/_tab_overview.html.erb

@@ -15,7 +15,7 @@
   <%= _('Evaluated at:') %> <%= job_invocation.targeting.resolved_at %><br>
   <% if job_invocation.template_invocations.size > 1 %>
     <% job_invocation.template_invocations.each do |template_invocation| %>
-      <%= host_counter _(RemoteExecutionProvider.provider_for(template_invocation.template.provider_type)), ForemanTasks::Task::DynflowTask.for_action(Actions::RemoteExecution::RunHostJob).for_resource(template_invocation).uniq.size %>
+      <%= host_counter template_invocation.template.provider.humanized_name, ForemanTasks::Task::DynflowTask.for_action(Actions::RemoteExecution::RunHostJob).for_resource(template_invocation).uniq.size %>
     <% end %>
   <% end %>
   <%= host_counter(_('Total hosts'), job_invocation.total_hosts_count) %>
@@ -25,7 +25,7 @@
   <h4><%= _('Providers and templates') %></h4>
   <% job_invocation.template_invocations.each do |template_invocation| %>
     <h5>
-      <b><%= template_invocation.template.name %></b> <%= 'through' %> <%= _(RemoteExecutionProvider.provider_for(template_invocation.template.provider_type)) %>
+      <b><%= template_invocation.template.name %></b> <%= 'through' %> <%= template_invocation.template.provider.humanized_name %>
     </h5>
     <% target = template_invocation.targeting.hosts.with_os.first || template_invocation.targeting.hosts.first %>
     <%= _('Preview for target %s') % target.try(:name) || 'N/A' %>
@@ -40,5 +40,8 @@
         <% end %>
       </ul>
     <% end %>
+    <% if template_invocation.effective_user %>
+      <b><%= _("Effective user") %></b>: <%= template_invocation.effective_user %>
+    <% end %>
   <% end %>
 </div>

data/app/views/job_invocations/index.html.erb

@@ -3,28 +3,28 @@
 <table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
-      <th><%= _('Job name') %></th>
+      <th><%= sort :job_name, :as => _('Job name') %></th>
       <th><%= _('Status') %></th>
       <th><%= _('Succeeded') %></th>
       <th><%= _('Failed') %></th>
       <th><%= _('Pending') %></th>
       <th><%= _('Total hosts') %></th>
+      <th><%= sort :started_at, :as => _('Started') %></th>
     </tr>
   </thead>
 
   <tbody>
     <% @job_invocations.each do |invocation| %>
       <tr>
-        <td><%= link_to_if_authorized invocation.job_name, hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocation) %></td>
+        <td><%= link_to_if_authorized "#{invocation.description.try(:capitalize) || invocation.job_name}", hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocation) %></td>
         <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
         <td><%= invocation_count(invocation, :output_key => :success_count) %></td>
         <td><%= invocation_count(invocation, :output_key => :failed_count) %></td>
         <td><%= invocation_count(invocation, :output_key => :pending_count) %></td>
         <td><%= invocation_count(invocation, :output_key => :total_count) %></td>
+	<td><%= time_ago(invocation.task.try(:started_at)) %></td>
       </tr>
     <% end %>
   </tbody>
-
 </table>
-
 <%= will_paginate_with_info @job_invocations %>

data/app/views/job_invocations/refresh.js.erb

@@ -1 +1,2 @@
-$('form#job_invocation_form').html("<%=j render :partial => 'form' %>");
+$('form#job_invocation_form').replaceWith("<%=j render :partial => 'form' %>");
+$('#job_invocation_form').find('a[rel="popover"]').popover();

data/app/views/job_invocations/show.html.erb

@@ -2,13 +2,14 @@
 <% stylesheet 'job_invocations' %>
 <% javascript 'template_invocation' %>
 
-<% if @job_invocation.last_task %>
-  <% title_actions(button_group(job_invocation_task_buttons(@job_invocation.last_task))) %>
+<% if @job_invocation.task %>
+  <% title_actions(button_group(job_invocation_task_buttons(@job_invocation.task))) %>
 <% end %>
 
 <ul class="nav nav-tabs" data-tabs="tabs">
   <li class="<%= job_invocation_active_tab(:overview, params) %>"><a href="#primary" data-toggle="tab"><%= _('Overview') %></a></li>
   <li class="<%= job_invocation_active_tab(:hosts, params) %>"><a href="#hosts" data-toggle="tab"><%= _('Hosts') %></a></li>
+  <% unless @job_invocation.recurring_logic.nil? %><li><a href="#recurring_logic" data-toggle="tab"><%= _('Recurring logic') %></a></li><% end %>
 </ul>
 
 <div class="tab-content">
@@ -19,6 +20,16 @@
   <div class="tab-pane <%= job_invocation_active_tab(:hosts, params) %>" id="hosts" data-refresh_required="<%= @job_invocation.resolved? ? '' : 'true' %>">
     <%= render 'tab_hosts', :job_invocation => @job_invocation, :hosts => @hosts %>
   </div>
+
+  <% unless @job_invocation.recurring_logic.nil? %>
+  <div class="tab-pane" id="recurring_logic">
+    <div class='col-md-6'>
+      <% if @job_invocation.recurring_logic.try(:task_group) %>
+      <%= render @job_invocation.recurring_logic.task_group, :task_group => @job_invocation.recurring_logic.try(:task_group) %>
+      <% end %>
+    </div>
+  </div>
+  <% end %>
 </div>
 
 <script id="job_invocation_refresh" data-refresh-url="<%= job_invocation_path(@job_invocation) %>">

data/app/views/job_invocations/show.js.erb

@@ -1,4 +1,4 @@
-$('div.btn-group').html('<%= button_group(job_invocation_task_buttons(@job_invocation.last_task)).html_safe %>');
+$('div.btn-group').html('<%= button_group(job_invocation_task_buttons(@job_invocation.task)).html_safe %>');
 $('div#status_chart').html('<%=j job_invocation_chart(@job_invocation) %>');
 $('div#status').flot_pie();