Mercurial > hg > soundsoftware-site
comparison app/controllers/projects_controller.rb @ 1358:b8f94812d737 cannam
Merge from branch bug_635
author | Chris Cannam |
---|---|
date | Thu, 18 Jul 2013 12:20:01 +0100 |
parents | fc0fecf09eb9 |
children | 51364c0cd58f ce4819fa2692 |
comparison
equal
deleted
inserted
replaced
1357:bef3c810b1e4 | 1358:b8f94812d737 |
---|---|
194 def settings | 194 def settings |
195 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") | 195 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") |
196 @issue_category ||= IssueCategory.new | 196 @issue_category ||= IssueCategory.new |
197 @member ||= @project.members.new | 197 @member ||= @project.members.new |
198 @trackers = Tracker.sorted.all | 198 @trackers = Tracker.sorted.all |
199 @repository ||= @project.repository | |
199 @wiki ||= @project.wiki | 200 @wiki ||= @project.wiki |
200 end | 201 end |
201 | 202 |
202 def edit | 203 def edit |
203 end | 204 end |