jro_apps/redmine Commit - r130:e3becc7c3c53

0

app/views/common/404.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<h2>404</h2>
	2
	3	<p><%= l(:notice_file_not_found) %></p>
	4	<p><a href="javascript:history.back()">Back</a></p>

0

app/controllers/account_controller.rb +2 0

               def show
                 @user = User.find(params[:id])
                 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
               # Login request and validation

0

app/controllers/application.rb +6 0

                   redirect_to_url session[:return_to]
                   session[:return_to] = nil
                 end
+              end
+              def render_404
+                @html_title = "404"
+                render :template => "common/404", :layout => true, :status => 404
+                return false
               end
               # qvalues http header parser

0

app/controllers/documents_controller.rb +3 -2

                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash.now[:notice] = l(:notice_file_not_found)
+                render_404
-                render :text => "", :layout => true, :status => 404
               end
               def add_attachment
               def find_project
                 @document = Document.find(params[:id])
                 @project = @document.project
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
             end

0

app/controllers/issue_categories_controller.rb +5 -3

               end
             private
-            	def find_project
+              def find_project
                 @category = IssueCategory.find(params[:id])
-            		@project = @category.project
+                @project = @category.project
-            	end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

0

app/controllers/issues_controller.rb +3 -2

                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash.now[:notice] = l(:notice_file_not_found)
+                render_404
-                render :text => "", :layout => true, :status => 404
               end
             private
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
             end

0

app/controllers/members_controller.rb +5 -3

             	end
             private
-            	def find_project
+              def find_project
                 @member = Member.find(params[:id])
-            		@project = @member.project
+                @project = @member.project
-            	end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

0

app/controllers/news_controller.rb +5 -3

             	end
             private
-            	def find_project
+              def find_project
                 @news = News.find(params[:id])
-            		@project = @news.project
+                @project = @news.project
-            	end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

0

app/controllers/projects_controller.rb +2 -2

               def find_project
                 @project = Project.find(params[:id])
                 @html_title = @project.name
-              rescue
+              rescue ActiveRecord::RecordNotFound
-                redirect_to :action => 'list'
+                render_404
               end
               # Retrieve query from session or build a new query

0

app/controllers/queries_controller.rb +2 0

                 @project = @query.project
                 # check if user is allowed to manage queries (same permission as add_query)
                 authorize('projects', 'add_query')
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
             end

0

app/controllers/reports_controller.rb +6 -4

               end
             private
-            	# Find project of id params[:id]
+              # Find project of id params[:id]
-            	def find_project
+              def find_project
-            		@project = Project.find(params[:id])
+                @project = Project.find(params[:id])
-            	end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             	def issues_by_tracker
                 @issues_by_tracker ||=

0

app/controllers/repositories_controller.rb +2 0

                 @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
                 @path ||= ''
                 @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
               def show_error

0

app/controllers/versions_controller.rb +3 -2

                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash.now[:notice] = l(:notice_file_not_found)
+                render_404
-                render :text => "", :layout => true, :status => 404
               end
               def destroy_file
               def find_project
                 @version = Version.find(params[:id])
                 @project = @version.project
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
             end

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages