diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-15 13:23:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-15 13:23:13 +0000 |
| commit | f16cddd57ae87b820d24dd378ef036c52a4f15d4 (patch) | |
| tree | c99481dd328c4cf9868af6422278ab8bd4bccede /app/helpers | |
| parent | 37205a8991920e3bc403f52711308878fea05553 (diff) | |
| download | redmine-f16cddd57ae87b820d24dd378ef036c52a4f15d4.tar.gz redmine-f16cddd57ae87b820d24dd378ef036c52a4f15d4.zip | |
Private issues (#7414).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5466 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issues_helper.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index d47b6e7fe..86f11c706 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -61,18 +61,23 @@ module IssuesHelper def render_issue_subject_with_tree(issue) s = '' - ancestors = issue.root? ? [] : issue.ancestors.all + ancestors = issue.root? ? [] : issue.ancestors.visible.all ancestors.each do |ancestor| s << '<div>' + content_tag('p', link_to_issue(ancestor)) end - s << '<div>' + content_tag('h3', h(issue.subject)) + s << '<div>' + subject = h(issue.subject) + if issue.is_private? + subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject + end + s << content_tag('h3', subject) s << '</div>' * (ancestors.size + 1) s end def render_descendants_tree(issue) s = '<form><table class="list issues">' - issue_list(issue.descendants.sort_by(&:lft)) do |child, level| + issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level| s << content_tag('tr', content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') + content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject') + @@ -159,6 +164,10 @@ module IssuesHelper label = l(:field_parent_issue) value = "##{detail.value}" unless detail.value.blank? old_value = "##{detail.old_value}" unless detail.old_value.blank? + + when detail.prop_key == 'is_private' + value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank? + old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank? end when 'cf' custom_field = CustomField.find_by_id(detail.prop_key) |