Mercurial > hg > soundsoftware-site
comparison app/controllers/.svn/text-base/application_controller.rb.svn-base @ 22:40f7cfd4df19
* Update to SVN trunk rev 4173
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 24 Sep 2010 14:06:04 +0100 |
parents | 1d32c0a0efbf |
children | 94944d00e43c |
comparison
equal
deleted
inserted
replaced
14:1d32c0a0efbf | 22:40f7cfd4df19 |
---|---|
167 @project = Project.find(params[:id]) | 167 @project = Project.find(params[:id]) |
168 rescue ActiveRecord::RecordNotFound | 168 rescue ActiveRecord::RecordNotFound |
169 render_404 | 169 render_404 |
170 end | 170 end |
171 | 171 |
172 # Find project of id params[:project_id] | |
173 def find_project_by_project_id | |
174 @project = Project.find(params[:project_id]) | |
175 rescue ActiveRecord::RecordNotFound | |
176 render_404 | |
177 end | |
178 | |
172 # Find a project based on params[:project_id] | 179 # Find a project based on params[:project_id] |
173 # TODO: some subclasses override this, see about merging their logic | 180 # TODO: some subclasses override this, see about merging their logic |
174 def find_optional_project | 181 def find_optional_project |
175 @project = Project.find(params[:project_id]) unless params[:project_id].blank? | 182 @project = Project.find(params[:project_id]) unless params[:project_id].blank? |
176 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true) | 183 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true) |