' +
"#{ l(:label_jump_to_a_project) } " +
@@ -220,7 +236,7 @@
s
end
end
-
+
def project_tree_options_for_select(projects, options = {})
s = ''
project_tree(projects) do |project, level|
@@ -236,14 +252,14 @@
end
s
end
-
+
# Yields the given block for each project with its level in the tree
#
# Wrapper for Project#project_tree
def project_tree(projects, &block)
Project.project_tree(projects, &block)
end
-
+
def project_nested_ul(projects, &block)
s = ''
if projects.any?
@@ -254,7 +270,7 @@
else
ancestors.pop
s << ""
- while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
+ while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
ancestors.pop
s << "\n"
end
@@ -267,20 +283,20 @@
end
s
end
-
+
def principals_check_box_tags(name, principals)
s = ''
principals.sort.each do |principal|
s << "#{ check_box_tag name, principal.id, false } #{h principal} \n"
end
- s
+ s
end
# Truncates and returns the string as a single line
def truncate_single_line(string, *args)
truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ')
end
-
+
# Truncates at line break after 250 characters or options[:length]
def truncate_lines(string, options={})
length = options[:length] || 250
@@ -298,7 +314,7 @@
def authoring(created, author, options={})
l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created))
end
-
+
def time_tag(time)
text = distance_of_time_in_words(Time.now, time)
if @project
@@ -320,20 +336,18 @@
page_param = options.delete(:page_param) || :page
per_page_links = options.delete(:per_page_links)
url_param = params.dup
- # don't reuse query params if filters are present
- url_param.merge!(:fields => nil, :values => nil, :operators => nil) if url_param.delete(:set_filter)
html = ''
if paginator.current.previous
- html << link_to_remote_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
+ html << link_to_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
end
html << (pagination_links_each(paginator, options) do |n|
- link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
+ link_to_content_update(n.to_s, url_param.merge(page_param => n))
end || '')
-
+
if paginator.current.next
- html << ' ' + link_to_remote_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next))
+ html << ' ' + link_to_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next))
end
unless count.nil?
@@ -345,20 +359,14 @@
html
end
-
+
def per_page_links(selected=nil)
- url_param = params.dup
- url_param.clear if url_param.has_key?(:set_filter)
-
links = Setting.per_page_options_array.collect do |n|
- n == selected ? n : link_to_remote(n, {:update => "content",
- :url => params.dup.merge(:per_page => n),
- :method => :get},
- {:href => url_for(url_param.merge(:per_page => n))})
+ n == selected ? n : link_to_content_update(n, params.merge(:per_page => n))
end
links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
end
-
+
def reorder_links(name, url)
link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)), url.merge({"#{name}[move_to]" => 'highest'}), :method => :post, :title => l(:label_sort_highest)) +
link_to(image_tag('1uparrow.png', :alt => l(:label_sort_higher)), url.merge({"#{name}[move_to]" => 'higher'}), :method => :post, :title => l(:label_sort_higher)) +
@@ -370,19 +378,19 @@
elements = args.flatten
elements.any? ? content_tag('p', args.join(' » ') + ' » ', :class => 'breadcrumb') : nil
end
-
+
def other_formats_links(&block)
concat('' + l(:label_export_to))
yield Redmine::Views::OtherFormatsBuilder.new(self)
concat('
')
end
-
+
def page_header_title
if @project.nil? || @project.new_record?
h(Setting.app_title)
else
b = []
- ancestors = (@project.root? ? [] : @project.ancestors.visible)
+ ancestors = (@project.root? ? [] : @project.ancestors.visible.all)
if ancestors.any?
root = ancestors.shift
b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
@@ -449,14 +457,21 @@
only_path = options.delete(:only_path) == false ? false : true
text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr) { |macro, args| exec_macro(macro, obj, args) }
-
- parse_non_pre_blocks(text) do |text|
+
+ @parsed_headings = []
+ text = parse_non_pre_blocks(text) do |text|
[:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_headings].each do |method_name|
send method_name, text, project, obj, attr, only_path, options
end
end
+
+ if @parsed_headings.any?
+ replace_toc(text, @parsed_headings)
+ end
+
+ text
end
-
+
def parse_non_pre_blocks(text)
s = StringScanner.new(text)
tags = []
@@ -485,13 +500,13 @@
end
parsed
end
-
+
def parse_inline_attachments(text, project, obj, attr, only_path, options)
# when using an image link, try to use an attachment, if possible
if options[:attachments] || (obj && obj.respond_to?(:attachments))
attachments = nil
text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
- filename, ext, alt, alttext = $1.downcase, $2, $3, $4
+ filename, ext, alt, alttext = $1.downcase, $2, $3, $4
attachments ||= (options[:attachments] || obj.attachments).sort_by(&:created_on).reverse
# search for the picture in attachments
if found = attachments.detect { |att| att.filename.downcase == filename }
@@ -554,7 +569,7 @@
end
end
end
-
+
# Redmine links
#
# Examples:
@@ -579,16 +594,26 @@
# source:some/file#L120 -> Link to line 120 of the file
# source:some/file@52#L120 -> Link to line 120 of the file's revision 52
# export:some/file -> Force the download of the file
- # Forum messages:
+ # Forum messages:
# message#1218 -> Link to message with id 1218
+ #
+ # Links can refer other objects from other projects, using project identifier:
+ # identifier:r52
+ # identifier:document:"Some document"
+ # identifier:version:1.0.0
+ # identifier:source:some/file
def parse_redmine_links(text, project, obj, attr, only_path, options)
- text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|\]|<|$)}) do |m|
- leading, esc, prefix, sep, identifier = $1, $2, $3, $5 || $7, $6 || $8
+ text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-]+):)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|\]|<|$)}) do |m|
+ leading, esc, project_prefix, project_identifier, prefix, sep, identifier = $1, $2, $3, $4, $5, $7 || $9, $8 || $10
link = nil
+ if project_identifier
+ project = Project.visible.find_by_identifier(project_identifier)
+ end
if esc.nil?
if prefix.nil? && sep == 'r'
- if project && (changeset = project.changesets.find_by_revision(identifier))
- link = link_to("r#{identifier}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
+ # project.changesets.visible raises an SQL error because of a double join on repositories
+ if project && project.repository && (changeset = Changeset.visible.find_by_repository_id_and_revision(project.repository.id, identifier))
+ link = link_to("#{project_prefix}r#{identifier}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
:class => 'changeset',
:title => truncate_single_line(changeset.comments, :length => 100))
end
@@ -602,24 +627,18 @@
:title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
end
when 'document'
- if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+ if document = Document.visible.find_by_id(oid)
link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
:class => 'document'
end
when 'version'
- if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+ if version = Version.visible.find_by_id(oid)
link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
:class => 'version'
end
when 'message'
- if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
- link = link_to h(truncate(message.subject, :length => 60)), {:only_path => only_path,
- :controller => 'messages',
- :action => 'show',
- :board_id => message.board,
- :id => message.root,
- :anchor => (message.parent ? "message-#{message.id}" : nil)},
- :class => 'message'
+ if message = Message.visible.find_by_id(oid, :include => :parent)
+ link = link_to_message(message, {:only_path => only_path}, :class => 'message')
end
when 'project'
if p = Project.visible.find_by_id(oid)
@@ -631,26 +650,26 @@
name = identifier.gsub(%r{^"(.*)"$}, "\\1")
case prefix
when 'document'
- if project && document = project.documents.find_by_title(name)
+ if project && document = project.documents.visible.find_by_title(name)
link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
:class => 'document'
end
when 'version'
- if project && version = project.versions.find_by_name(name)
+ if project && version = project.versions.visible.find_by_name(name)
link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
:class => 'version'
end
when 'commit'
- if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
- link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
+ if project && project.repository && (changeset = Changeset.visible.find(:first, :conditions => ["repository_id = ? AND scmid LIKE ?", project.repository.id, "#{name}%"]))
+ link = link_to h("#{project_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.identifier},
:class => 'changeset',
:title => truncate_single_line(changeset.comments, :length => 100)
end
when 'source', 'export'
- if project && project.repository
+ if project && project.repository && User.current.allowed_to?(:browse_repository, project)
name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
path, rev, anchor = $1, $3, $5
- link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
+ link = link_to h("#{project_prefix}#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
:path => to_path_param(path),
:rev => rev,
:anchor => anchor,
@@ -670,25 +689,30 @@
end
end
end
- leading + (link || "#{prefix}#{sep}#{identifier}")
+ leading + (link || "#{project_prefix}#{prefix}#{sep}#{identifier}")
end
end
-
- TOC_RE = /\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
+
HEADING_RE = /]+)?>(.+?)<\/h(1|2|3|4)>/i unless const_defined?(:HEADING_RE)
-
+
# Headings and TOC
- # Adds ids and links to headings and renders the TOC if needed unless options[:headings] is set to false
+ # Adds ids and links to headings unless options[:headings] is set to false
def parse_headings(text, project, obj, attr, only_path, options)
- headings = []
+ return if options[:headings] == false
+
text.gsub!(HEADING_RE) do
level, attrs, content = $1.to_i, $2, $3
item = strip_tags(content).strip
anchor = item.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
- headings << [level, anchor, item]
- "#{content}¶ "
- end unless options[:headings] == false
-
+ @parsed_headings << [level, anchor, item]
+ "#{content}¶ "
+ end
+ end
+
+ TOC_RE = /\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
+
+ # Renders the TOC with given headings
+ def replace_toc(text, headings)
text.gsub!(TOC_RE) do
if headings.empty?
''
@@ -769,13 +793,13 @@
), :class => 'progress', :style => "width: #{width};") +
content_tag('p', legend, :class => 'pourcent')
end
-
+
def checked_image(checked=true)
if checked
image_tag 'toggle_check.png'
end
end
-
+
def context_menu(url)
unless @context_menu_included
content_for :header_tags do
@@ -823,13 +847,15 @@
'Calendar._FD = 1;' # Monday
when 7
'Calendar._FD = 0;' # Sunday
+ when 6
+ 'Calendar._FD = 6;' # Saturday
else
'' # use language
end
-
+
javascript_include_tag('calendar/calendar') +
javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
- javascript_tag(start_of_week) +
+ javascript_tag(start_of_week) +
javascript_include_tag('calendar/calendar-setup') +
stylesheet_link_tag('calendar')
end
@@ -863,10 +889,45 @@
end
end
+ # Returns the javascript tags that are included in the html layout head
+ def javascript_heads
+ tags = javascript_include_tag(:defaults)
+ unless User.current.pref.warn_on_leaving_unsaved == '0'
+ tags << "\n" + javascript_tag("Event.observe(window, 'load', function(){ new WarnLeavingUnsaved('#{escape_javascript( l(:text_warn_on_leaving_unsaved) )}'); });")
+ end
+ tags
+ end
+
def favicon
"--- #{l(:actionview_instancetag_blank_option)} --- " : '') :
'#{@cached_label_assigned_to} : #{issue.assigned_to}#{@cached_label_priority} : #{issue.priority.name}"
end
-
+
+ def issue_heading(issue)
+ h("#{issue.tracker} ##{issue.id}")
+ end
+
def render_issue_subject_with_tree(issue)
s = ''
- issue.ancestors.each do |ancestor|
+ ancestors = issue.root? ? [] : issue.ancestors.visible.all
+ ancestors.each do |ancestor|
s << '
' + content_tag('p', link_to_issue(ancestor))
end
- s << '
' + content_tag('h3', h(issue.subject))
- s << '
' * (issue.ancestors.size + 1)
+ s << '
'
+ 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 << '
' * (ancestors.size + 1)
s
end
-
+
def render_descendants_tree(issue)
s = '