##// END OF EJS Templates
do not show estimated time if it is nil on issue page...
Toshi MARUYAMA -
r10181:7d8db59dae41
parent child
Show More
@@ -1,158 +1,160
1 1 <%= render :partial => 'action_menu' %>
2 2
3 3 <h2><%= issue_heading(@issue) %></h2>
4 4
5 5 <div class="<%= @issue.css_classes %> details">
6 6 <% if @prev_issue_id || @next_issue_id %>
7 7 <div class="next-prev-links contextual">
8 8 <%= link_to_if @prev_issue_id,
9 9 "\xc2\xab #{l(:label_previous)}",
10 10 (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11 11 :title => "##{@prev_issue_id}" %> |
12 12 <% if @issue_position && @issue_count %>
13 13 <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
14 14 <% end %>
15 15 <%= link_to_if @next_issue_id,
16 16 "#{l(:label_next)} \xc2\xbb",
17 17 (@next_issue_id ? issue_path(@next_issue_id) : nil),
18 18 :title => "##{@next_issue_id}" %>
19 19 </div>
20 20 <% end %>
21 21
22 22 <%= avatar(@issue.author, :size => "50") %>
23 23
24 24 <div class="subject">
25 25 <%= render_issue_subject_with_tree(@issue) %>
26 26 </div>
27 27 <p class="author">
28 28 <%= authoring @issue.created_on, @issue.author %>.
29 29 <% if @issue.created_on != @issue.updated_on %>
30 30 <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
31 31 <% end %>
32 32 </p>
33 33
34 34 <table class="attributes">
35 35 <%= issue_fields_rows do |rows|
36 36 rows.left l(:field_status), h(@issue.status.name), :class => 'status'
37 37 rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
38 38
39 39 unless @issue.disabled_core_fields.include?('assigned_to_id')
40 40 rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
41 41 end
42 42 unless @issue.disabled_core_fields.include?('category_id')
43 43 rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
44 44 end
45 45 unless @issue.disabled_core_fields.include?('fixed_version_id')
46 46 rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
47 47 end
48 48
49 49 unless @issue.disabled_core_fields.include?('start_date')
50 50 rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
51 51 end
52 52 unless @issue.disabled_core_fields.include?('due_date')
53 53 rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
54 54 end
55 55 unless @issue.disabled_core_fields.include?('done_ratio')
56 56 rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
57 57 end
58 58 unless @issue.disabled_core_fields.include?('estimated_hours')
59 unless @issue.estimated_hours.nil?
59 60 rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
60 61 end
62 end
61 63 if User.current.allowed_to?(:view_time_entries, @project)
62 64 rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-"), :class => 'spent-time'
63 65 end
64 66 end %>
65 67 <%= render_custom_fields_rows(@issue) %>
66 68 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
67 69 </table>
68 70
69 71 <% if @issue.description? || @issue.attachments.any? -%>
70 72 <hr />
71 73 <% if @issue.description? %>
72 74 <div class="contextual">
73 75 <%= link_to l(:button_quote),
74 76 {:controller => 'journals', :action => 'new', :id => @issue},
75 77 :remote => true,
76 78 :method => 'post',
77 79 :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
78 80 </div>
79 81
80 82 <p><strong><%=l(:field_description)%></strong></p>
81 83 <div class="wiki">
82 84 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
83 85 </div>
84 86 <% end %>
85 87 <%= link_to_attachments @issue, :thumbnails => true %>
86 88 <% end -%>
87 89
88 90 <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
89 91
90 92 <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
91 93 <hr />
92 94 <div id="issue_tree">
93 95 <div class="contextual">
94 96 <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
95 97 </div>
96 98 <p><strong><%=l(:label_subtask_plural)%></strong></p>
97 99 <%= render_descendants_tree(@issue) unless @issue.leaf? %>
98 100 </div>
99 101 <% end %>
100 102
101 103 <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
102 104 <hr />
103 105 <div id="relations">
104 106 <%= render :partial => 'relations' %>
105 107 </div>
106 108 <% end %>
107 109
108 110 </div>
109 111
110 112 <% if @changesets.present? %>
111 113 <div id="issue-changesets">
112 114 <h3><%=l(:label_associated_revisions)%></h3>
113 115 <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
114 116 </div>
115 117 <% end %>
116 118
117 119 <% if @journals.present? %>
118 120 <div id="history">
119 121 <h3><%=l(:label_history)%></h3>
120 122 <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
121 123 </div>
122 124 <% end %>
123 125
124 126
125 127 <div style="clear: both;"></div>
126 128 <%= render :partial => 'action_menu' %>
127 129
128 130 <div style="clear: both;"></div>
129 131 <% if authorize_for('issues', 'edit') %>
130 132 <div id="update" style="display:none;">
131 133 <h3><%= l(:button_update) %></h3>
132 134 <%= render :partial => 'edit' %>
133 135 </div>
134 136 <% end %>
135 137
136 138 <% other_formats_links do |f| %>
137 139 <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
138 140 <%= f.link_to 'PDF' %>
139 141 <% end %>
140 142
141 143 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
142 144
143 145 <% content_for :sidebar do %>
144 146 <%= render :partial => 'issues/sidebar' %>
145 147
146 148 <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
147 149 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
148 150 <div id="watchers">
149 151 <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
150 152 </div>
151 153 <% end %>
152 154 <% end %>
153 155
154 156 <% content_for :header_tags do %>
155 157 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
156 158 <% end %>
157 159
158 160 <%= context_menu issues_context_menu_path %>
General Comments 0
You need to be logged in to leave comments. Login now