##// END OF EJS Templates
Prevent recursive calls to RepositoriesHelper#repository_field_tags (#3226)....
Jean-Philippe Lang -
r2588:6385217be04b
parent child
Show More
@@ -1,182 +1,182
1 # redMine - project management software
1 # redMine - project management software
2 # Copyright (C) 2006 Jean-Philippe Lang
2 # Copyright (C) 2006 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 require 'iconv'
18 require 'iconv'
19
19
20 module RepositoriesHelper
20 module RepositoriesHelper
21 def format_revision(txt)
21 def format_revision(txt)
22 txt.to_s[0,8]
22 txt.to_s[0,8]
23 end
23 end
24
24
25 def truncate_at_line_break(text, length = 255)
25 def truncate_at_line_break(text, length = 255)
26 if text
26 if text
27 text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
27 text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
28 end
28 end
29 end
29 end
30
30
31 def render_properties(properties)
31 def render_properties(properties)
32 unless properties.nil? || properties.empty?
32 unless properties.nil? || properties.empty?
33 content = ''
33 content = ''
34 properties.keys.sort.each do |property|
34 properties.keys.sort.each do |property|
35 content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
35 content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
36 end
36 end
37 content_tag('ul', content, :class => 'properties')
37 content_tag('ul', content, :class => 'properties')
38 end
38 end
39 end
39 end
40
40
41 def render_changeset_changes
41 def render_changeset_changes
42 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
42 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
43 case change.action
43 case change.action
44 when 'A'
44 when 'A'
45 # Detects moved/copied files
45 # Detects moved/copied files
46 if !change.from_path.blank?
46 if !change.from_path.blank?
47 change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
47 change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
48 end
48 end
49 change
49 change
50 when 'D'
50 when 'D'
51 @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
51 @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
52 else
52 else
53 change
53 change
54 end
54 end
55 end.compact
55 end.compact
56
56
57 tree = { }
57 tree = { }
58 changes.each do |change|
58 changes.each do |change|
59 p = tree
59 p = tree
60 dirs = change.path.to_s.split('/').select {|d| !d.blank?}
60 dirs = change.path.to_s.split('/').select {|d| !d.blank?}
61 dirs.each do |dir|
61 dirs.each do |dir|
62 p[:s] ||= {}
62 p[:s] ||= {}
63 p = p[:s]
63 p = p[:s]
64 p[dir] ||= {}
64 p[dir] ||= {}
65 p = p[dir]
65 p = p[dir]
66 end
66 end
67 p[:c] = change
67 p[:c] = change
68 end
68 end
69
69
70 render_changes_tree(tree[:s])
70 render_changes_tree(tree[:s])
71 end
71 end
72
72
73 def render_changes_tree(tree)
73 def render_changes_tree(tree)
74 return '' if tree.nil?
74 return '' if tree.nil?
75
75
76 output = ''
76 output = ''
77 output << '<ul>'
77 output << '<ul>'
78 tree.keys.sort.each do |file|
78 tree.keys.sort.each do |file|
79 s = !tree[file][:s].nil?
79 s = !tree[file][:s].nil?
80 c = tree[file][:c]
80 c = tree[file][:c]
81
81
82 style = 'change'
82 style = 'change'
83 style << ' folder' if s
83 style << ' folder' if s
84 style << " change-#{c.action}" if c
84 style << " change-#{c.action}" if c
85
85
86 text = h(file)
86 text = h(file)
87 unless c.nil?
87 unless c.nil?
88 path_param = to_path_param(@repository.relative_path(c.path))
88 path_param = to_path_param(@repository.relative_path(c.path))
89 text = link_to(text, :controller => 'repositories',
89 text = link_to(text, :controller => 'repositories',
90 :action => 'entry',
90 :action => 'entry',
91 :id => @project,
91 :id => @project,
92 :path => path_param,
92 :path => path_param,
93 :rev => @changeset.revision) unless s || c.action == 'D'
93 :rev => @changeset.revision) unless s || c.action == 'D'
94 text << " - #{c.revision}" unless c.revision.blank?
94 text << " - #{c.revision}" unless c.revision.blank?
95 text << ' (' + link_to('diff', :controller => 'repositories',
95 text << ' (' + link_to('diff', :controller => 'repositories',
96 :action => 'diff',
96 :action => 'diff',
97 :id => @project,
97 :id => @project,
98 :path => path_param,
98 :path => path_param,
99 :rev => @changeset.revision) + ') ' if c.action == 'M'
99 :rev => @changeset.revision) + ') ' if c.action == 'M'
100 text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
100 text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
101 end
101 end
102 output << "<li class='#{style}'>#{text}</li>"
102 output << "<li class='#{style}'>#{text}</li>"
103 output << render_changes_tree(tree[file][:s]) if s
103 output << render_changes_tree(tree[file][:s]) if s
104 end
104 end
105 output << '</ul>'
105 output << '</ul>'
106 output
106 output
107 end
107 end
108
108
109 def to_utf8(str)
109 def to_utf8(str)
110 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
110 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
111 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
111 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
112 @encodings.each do |encoding|
112 @encodings.each do |encoding|
113 begin
113 begin
114 return Iconv.conv('UTF-8', encoding, str)
114 return Iconv.conv('UTF-8', encoding, str)
115 rescue Iconv::Failure
115 rescue Iconv::Failure
116 # do nothing here and try the next encoding
116 # do nothing here and try the next encoding
117 end
117 end
118 end
118 end
119 str
119 str
120 end
120 end
121
121
122 def repository_field_tags(form, repository)
122 def repository_field_tags(form, repository)
123 method = repository.class.name.demodulize.underscore + "_field_tags"
123 method = repository.class.name.demodulize.underscore + "_field_tags"
124 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
124 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method) && method != 'repository_field_tags'
125 end
125 end
126
126
127 def scm_select_tag(repository)
127 def scm_select_tag(repository)
128 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
128 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
129 REDMINE_SUPPORTED_SCM.each do |scm|
129 REDMINE_SUPPORTED_SCM.each do |scm|
130 scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
130 scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
131 end
131 end
132
132
133 select_tag('repository_scm',
133 select_tag('repository_scm',
134 options_for_select(scm_options, repository.class.name.demodulize),
134 options_for_select(scm_options, repository.class.name.demodulize),
135 :disabled => (repository && !repository.new_record?),
135 :disabled => (repository && !repository.new_record?),
136 :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
136 :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
137 )
137 )
138 end
138 end
139
139
140 def with_leading_slash(path)
140 def with_leading_slash(path)
141 path.to_s.starts_with?('/') ? path : "/#{path}"
141 path.to_s.starts_with?('/') ? path : "/#{path}"
142 end
142 end
143
143
144 def without_leading_slash(path)
144 def without_leading_slash(path)
145 path.gsub(%r{^/+}, '')
145 path.gsub(%r{^/+}, '')
146 end
146 end
147
147
148 def subversion_field_tags(form, repository)
148 def subversion_field_tags(form, repository)
149 content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
149 content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
150 '<br />(http://, https://, svn://, file:///)') +
150 '<br />(http://, https://, svn://, file:///)') +
151 content_tag('p', form.text_field(:login, :size => 30)) +
151 content_tag('p', form.text_field(:login, :size => 30)) +
152 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
152 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
153 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
153 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
154 :onfocus => "this.value=''; this.name='repository[password]';",
154 :onfocus => "this.value=''; this.name='repository[password]';",
155 :onchange => "this.name='repository[password]';"))
155 :onchange => "this.name='repository[password]';"))
156 end
156 end
157
157
158 def darcs_field_tags(form, repository)
158 def darcs_field_tags(form, repository)
159 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
159 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
160 end
160 end
161
161
162 def mercurial_field_tags(form, repository)
162 def mercurial_field_tags(form, repository)
163 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
163 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
164 end
164 end
165
165
166 def git_field_tags(form, repository)
166 def git_field_tags(form, repository)
167 content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
167 content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
168 end
168 end
169
169
170 def cvs_field_tags(form, repository)
170 def cvs_field_tags(form, repository)
171 content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
171 content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
172 content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
172 content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
173 end
173 end
174
174
175 def bazaar_field_tags(form, repository)
175 def bazaar_field_tags(form, repository)
176 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
176 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
177 end
177 end
178
178
179 def filesystem_field_tags(form, repository)
179 def filesystem_field_tags(form, repository)
180 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
180 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
181 end
181 end
182 end
182 end
General Comments 0
You need to be logged in to leave comments. Login now