scm browser commit before merge

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@104 e93f8b46-1217-0410-a6f0-8f06a7374b81

scm/app/controllers/repositories_controller.rb

@@ -1,39 +1,42 @@
 class RepositoriesController < ApplicationController
   layout 'base'
-  before_filter :find_project
+  before_filter :find_project, :authorize
 
   def show
+    @entries = @repository.scm.entries('')
+    show_error and return unless @entries
+    @latest_revision = @entries.revisions.latest
   end
   
   def browse
     @entries = @repository.scm.entries(@path, @rev)
-    redirect_to :action => 'show', :id => @project and return unless @entries
+    show_error and return unless @entries
   end
   
-  def entry_revisions
+  def revisions
     @entry = @repository.scm.entry(@path, @rev)
     @revisions = @repository.scm.revisions(@path, @rev)
-    redirect_to :action => 'show', :id => @project and return unless @entry && @revisions
+    show_error and return unless @entry && @revisions
   end
   
   def entry
     if 'raw' == params[:format]
       content = @repository.scm.cat(@path, @rev)
-      redirect_to :action => 'show', :id => @project and return unless content
+      show_error and return unless content
       send_data content, :filename => @path.split('/').last
     end
   end
   
   def revision
     @revisions = @repository.scm.revisions '', @rev, @rev, :with_paths => true
-    redirect_to :action => 'show', :id => @project and return unless @revisions
+    show_error and return unless @revisions
     @revision = @revisions.first  
   end
   
   def diff
     @rev_to = params[:rev_to] || (@rev-1)
     @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
-    redirect_to :action => 'show', :id => @project and return unless @diff
+    show_error and return unless @diff
   end
   
 private
@@ -44,4 +47,9 @@ private
     @path ||= ''
     @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
   end
+
+  def show_error
+    flash.now[:notice] = l(:notice_scm_error)
+    render :nothing => true, :layout => true
+  end
 end