summaryrefslogtreecommitdiff
path: root/app/controllers/tree_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/tree_controller.rb')
-rw-r--r--app/controllers/tree_controller.rb29
1 files changed, 6 insertions, 23 deletions
diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb
index 15bbb1a3c77..e0dd8f8beaf 100644
--- a/app/controllers/tree_controller.rb
+++ b/app/controllers/tree_controller.rb
@@ -15,35 +15,18 @@ class TreeController < ApplicationController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
- before_filter :define_tree_vars
+ before_filter :assign_ref_vars
def show
+ @hex_path = Digest::SHA1.hexdigest(@path)
+
+ @history_path = project_tree_path(@project, @id)
+ @logs_path = logs_file_project_ref_path(@project, @ref, @path)
+
respond_to do |format|
format.html
# Disable cache so browser history works
format.js { no_cache_headers }
end
end
-
- private
-
- def define_tree_vars
- @ref, @path = extract_ref(params[:id])
-
- @id = File.join(@ref, @path)
- @repo = @project.repo
- @commit = CommitDecorator.decorate(@project.commit(@ref))
-
- @tree = Tree.new(@commit.tree, @project, @ref, @path.gsub(/^\//, ''))
- @tree = TreeDecorator.new(@tree)
-
- raise InvalidPathError if @tree.invalid?
-
- @hex_path = Digest::SHA1.hexdigest(@path)
-
- @history_path = project_tree_path(@project, @id)
- @logs_path = logs_file_project_ref_path(@project, @ref, @path)
- rescue NoMethodError, InvalidPathError
- not_found!
- end
end