@@ -73,20 +73,7 @@ class Deployment < ActiveRecord::Base
def status_in_html
"<span class='deployment_status_#{self.status.gsub(/ /, '_')}'>#{self.status}</span>"
end
-
- def status_image
- case self.status
- when 'running'
- 'status_running_small.gif'
- when 'failed'
- 'status_failed_small.png'
- when 'success'
- 'status_success_small.png'
- when 'canceled'
- 'status_canceled_small.png'
- end
- end
-
+
def complete_with_error!
save_completed_status!(STATUS_FAILED)
notify_per_mail
app/models/deployment.rb
@@ -6,33 +6,11 @@
This stage was never deployed.
<br/>
<% else %>
- <br />
- This stage was deployed <%=h @stage.deployments.count %> times.
- <br /><br />
- <table class="sortable">
- <tr>
- <th>Task</th>
- <th>Started<br />Completed</th>
- <th style="width:200px;">Comment</th>
- <th>User</th>
- <th>Status</th>
- </tr>
- <% for deployment in @stage.deployments %>
- <tr class="<%= cycle :even, :odd, :name => 'deployments' %>">
- <td><%= link_to h(deployment.task), project_stage_deployment_path(current_project, current_stage, deployment) %></td>
- <td><%=h deployment.created_at.to_s(:log) %><br /><%=h deployment.completed_at.to_s(:log) rescue ' ' %></td>
- <td><%=h truncate(deployment.description, 37) %></td>
- <td><%= user_info(deployment.user) rescue '' %></td>
- <td><%= image_tag('peritor_theme/'+deployment.status_image)%></td>
- <td>
- <% if deployment.completed? %>
- <%= link_to "Repeat", new_project_stage_deployment_path(deployment.stage.project, deployment.stage) + '?repeat=' + h(deployment.id) %>
- <% end %>
- </td>
- </tr>
+ <% @stage.deployments.each do |deployment| %>
+ <%= render(:partial => 'deployments/list_item', :locals => {:deployment => deployment}) %>
<% end %>
- </table>
<% end %>
+<br />
</fieldset>
app/views/deployments/index.html.erb
@@ -8,12 +8,12 @@
<% end %>
<% end %>
<br />
- <% if @stage.deployment_possible? %>
- <%= link_to 'New deployment', new_project_stage_deployment_path(current_project, @stage), :class => 'arrow_link' %> <%= (@stage.deployments.count > 1) ? '|' : '' %>
- <% else %>
- A deployment is currently not possible:<br />
- <%= display_deployment_problems(@stage) %>
- <% end %>
- <% if @stage.deployments.count > 1 %>
- <%= link_to "Complete deployment history", project_stage_deployments_path(current_project, @stage), :class => 'arrow_link' %>
- <% end %>
+<% if @stage.deployment_possible? %>
+ <%= link_to 'New deployment', new_project_stage_deployment_path(current_project, @stage), :class => 'arrow_link' %> <%= (@stage.deployments.count > 1) ? '|' : '' %>
+<% else %>
+ A deployment is currently not possible:<br />
+ <%= display_deployment_problems(@stage) %>
+<% end %>
+<% if @stage.deployments.count > 1 %>
+ <%= link_to "Complete deployment history", project_stage_deployments_path(current_project, @stage), :class => 'arrow_link' %>
+<% end %>
app/views/stages/_deployments.html.erb
2e8e8f153f58588536a37f5f4ed1cdafcbb95525
Jonathan Weiss
jw@innerewut.de
http://github.com/timshadel/webistrano/commit/76b00ded89f7c92eed1883b412fa4c801a3b9df4
76b00ded89f7c92eed1883b412fa4c801a3b9df4
2008-10-06T05:11:48-07:00
2008-10-06T05:11:48-07:00
fix #100
git-svn-id: http://labs.peritor.com/svn/webistrano/trunk@189 e1153f85-6c6c-dc11-afa8-0013d3c39b19
79f5b6b506d4d17ffca2f15af9b48a9eccf9cf41
Jonathan Weiss
jw@innerewut.de