diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb index 53a8be434..891215503 100644 --- a/app/views/issues/_project_issue.html.erb +++ b/app/views/issues/_project_issue.html.erb @@ -11,8 +11,8 @@
<%= activity.subject.to_s %> <% if activity.journals.count > 0%> - - <%= activity.journals.count %> + + <%= activity.journals.count %> <% end %>
@@ -48,10 +48,19 @@ <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %> <% end %> <% end %> -
  • 20161231
  • -
  • 草稿
  • -
  • 90%
  • -
  • +
  • <%= activity.fixed_version %>
  • +
  • <%= activity.status.name%>
  • +
  • <%= activity.done_ratio %>%
  • +
  • + <%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %> + <% if !defined?(project_id) && !defined?(user_id) %> + <%= link_to "", issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %> + <% elsif defined?(project_id) %> + <%= link_to "", issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %> + <% elsif defined?(user_id) %> + <%= link_to "", issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %> + <% end %> +
  • <% end %> diff --git a/public/images/sy/sy_icons02.png b/public/images/sy/sy_icons02.png new file mode 100644 index 000000000..7d29ef2a9 Binary files /dev/null and b/public/images/sy/sy_icons02.png differ