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