fixes and repository, tree view
This commit is contained in:
parent
c148b48f74
commit
e9b9e044f9
|
@ -1,12 +1,17 @@
|
||||||
class Git::BaseController < ApplicationController
|
class Git::BaseController < ApplicationController
|
||||||
before_filter :authenticate_user!
|
before_filter :authenticate_user!
|
||||||
|
|
||||||
|
before_filter :find_platfrom
|
||||||
before_filter :find_project
|
before_filter :find_project
|
||||||
before_filter :find_repository
|
before_filter :find_repository
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
def find_platform
|
||||||
|
@platform = Platform.find_by_name!(params[:platform_name])
|
||||||
|
end
|
||||||
|
|
||||||
def find_project
|
def find_project
|
||||||
@project = Project.find_by_title!(params[:project_name])
|
@project = Project.find_by_name!(params[:project_name])
|
||||||
end
|
end
|
||||||
|
|
||||||
def find_repository
|
def find_repository
|
||||||
|
|
|
@ -5,9 +5,9 @@ class Git::RepositoriesController < Git::BaseController
|
||||||
@tree = @commit.tree
|
@tree = @commit.tree
|
||||||
end
|
end
|
||||||
|
|
||||||
def commits
|
# def commits
|
||||||
branch_name = (params[:branch] ? params[:branch] : "master")
|
# branch_name = (params[:branch] ? params[:branch] : "master")
|
||||||
@commits = @repository.commits(branch_name)
|
# @commits = @repository.commits(branch_name)
|
||||||
end
|
# end
|
||||||
|
|
||||||
end
|
end
|
|
@ -7,6 +7,6 @@ class Git::TreesController < Git::BaseController
|
||||||
@tree = @repository.tree(@treeish)
|
@tree = @repository.tree(@treeish)
|
||||||
@tree = @tree / @path if @path
|
@tree = @tree / @path if @path
|
||||||
|
|
||||||
# render :template => "repositories/show"
|
render :template => "git/repositories/show"
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -1,5 +1,5 @@
|
||||||
class Git::Repository
|
class Git::Repository
|
||||||
delegate :commits, :tree, :to => :repo
|
delegate :commits, :tree, :tags, :heads, :to => :repo
|
||||||
|
|
||||||
attr_accessor :path, :name
|
attr_accessor :path, :name
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
.row= link_to "Commits", commits_path(@platform.name, @project.name, @treeish)
|
||||||
|
.row.tags
|
||||||
|
%h3 Tags:
|
||||||
|
%ul
|
||||||
|
- @repository.tags.each do |tag|
|
||||||
|
%li= link_to tag.name, tree_path(@platform.name, @project.name, tag.name)
|
||||||
|
|
||||||
|
.row.heads
|
||||||
|
%h3 Heads:
|
||||||
|
%ul
|
||||||
|
- @repository.heads.each do |head|
|
||||||
|
%li= link_to head.name, tree_path(@platform.name, @project.name, head.name)
|
||||||
|
|
||||||
|
%table
|
||||||
|
%thead
|
||||||
|
%tr
|
||||||
|
%th name
|
||||||
|
%th age
|
||||||
|
%th message
|
||||||
|
|
||||||
|
%tbody
|
||||||
|
- if @path.present?
|
||||||
|
%tr
|
||||||
|
%td
|
||||||
|
= link_to "..", tree_path(@platform.name, @project.name, @treeish, File.join([@path, ".."].compact))
|
||||||
|
- @tree.contents.each do |entry|
|
||||||
|
%tr
|
||||||
|
%td
|
||||||
|
- if entry.is_a?(Grit::Blob)
|
||||||
|
= link_to entry.name, blob_path(@platform.name, @project.name, @treeish, File.join([@path, entry.name].compact))
|
||||||
|
- else
|
||||||
|
= link_to "#{entry.name}/", tree_path(@platform.name, @project.name, @repository.name, @treeish, File.join([@path, entry.name].compact))
|
||||||
|
%td==
|
||||||
|
%td==
|
Loading…
Reference in New Issue