Mercurial > hg > soundsoftware-site
comparison app/helpers/projects_helper.rb @ 1139:5e476516ffea redmine-2.2-integration
Ensure generated HTML is marked as safe & thus rendered
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Thu, 10 Jan 2013 15:11:59 +0000 |
parents | bb32da3bea34 |
children | 16826c3afbba |
comparison
equal
deleted
inserted
replaced
1138:9e8213f2dfb3 | 1139:5e476516ffea |
---|---|
56 if (project.short_description) | 56 if (project.short_description) |
57 s << "<div class='description'>" | 57 s << "<div class='description'>" |
58 s << textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '') | 58 s << textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '') |
59 s << "</div>" | 59 s << "</div>" |
60 end | 60 end |
61 s | 61 s.html_safe |
62 end | 62 end |
63 | 63 |
64 # Renders a tree of projects as a nested set of unordered lists | 64 # Renders a tree of projects as a nested set of unordered lists |
65 # The given collection may be a subset of the whole project tree | 65 # The given collection may be a subset of the whole project tree |
66 # (eg. some intermediate nodes are private and can not be seen) | 66 # (eg. some intermediate nodes are private and can not be seen) |
87 link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") | 87 link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") |
88 s << render_project_short_description(project) | 88 s << render_project_short_description(project) |
89 s << "</div>\n" | 89 s << "</div>\n" |
90 ancestors << project | 90 ancestors << project |
91 end | 91 end |
92 s | 92 end |
93 end | 93 s.html_safe |
94 end | 94 end |
95 | 95 |
96 | 96 |
97 def render_my_project_in_hierarchy(project) | 97 def render_my_project_in_hierarchy(project) |
98 | 98 |
154 a << s | 154 a << s |
155 a << "</ul>\n" | 155 a << "</ul>\n" |
156 s = a | 156 s = a |
157 end | 157 end |
158 | 158 |
159 s | 159 s.html_safe |
160 | 160 |
161 end | 161 end |
162 | 162 |
163 # Renders a tree of projects. The given collection may be a subset | 163 # Renders a tree of projects. The given collection may be a subset |
164 # of the whole project tree (eg. some intermediate nodes are private | 164 # of the whole project tree (eg. some intermediate nodes are private |
188 | 188 |
189 s << "</table>" | 189 s << "</table>" |
190 | 190 |
191 @project = original_project | 191 @project = original_project |
192 | 192 |
193 s | 193 s.html_safe |
194 end | 194 end |
195 | 195 |
196 | 196 |
197 def render_project_in_table(project, oddeven, level) | 197 def render_project_in_table(project, oddeven, level) |
198 | 198 |