Add search box for the commit.
This commit is contained in:
parent
81cc1cb87b
commit
8ff5cf9cd5
3 changed files with 22 additions and 6 deletions
|
@ -7,6 +7,16 @@ class GraphController < ProjectResourceController
|
||||||
before_filter :require_non_empty_project
|
before_filter :require_non_empty_project
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
if params.has_key?(:q) && params[:q].blank?
|
||||||
|
redirect_to project_graph_path(@project, params[:id])
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if params.has_key?(:q)
|
||||||
|
@q = params[:q]
|
||||||
|
@commit = @project.repository.commit(@q) || @commit
|
||||||
|
end
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
format.json do
|
format.json do
|
||||||
|
|
9
app/views/graph/_head.html.haml
Normal file
9
app/views/graph/_head.html.haml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
%ul.nav.nav-tabs
|
||||||
|
%li
|
||||||
|
= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
|
||||||
|
%li.pull-right.search
|
||||||
|
= form_tag project_graph_path(@project, params[:id]), method: :get, class: 'navbar-form' do |f|
|
||||||
|
= label_tag :search , "Looking for commit:"
|
||||||
|
= text_field_tag :q, @q, placeholder: "Input SHA", class: "search-input"
|
||||||
|
|
||||||
|
%h3.page_title Project Network Graph
|
|
@ -1,7 +1,4 @@
|
||||||
%h3.page_title Project Network Graph
|
= render "head"
|
||||||
%br
|
|
||||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
|
|
||||||
%br
|
|
||||||
.graph_holder
|
.graph_holder
|
||||||
%h4
|
%h4
|
||||||
%small You can move around the graph by using the arrow keys.
|
%small You can move around the graph by using the arrow keys.
|
||||||
|
@ -12,9 +9,9 @@
|
||||||
var branch_graph;
|
var branch_graph;
|
||||||
$(function(){
|
$(function(){
|
||||||
branch_graph = new BranchGraph($("#holder"), {
|
branch_graph = new BranchGraph($("#holder"), {
|
||||||
url: '#{project_graph_path(@project, @ref, format: :json)}',
|
url: '#{project_graph_path(@project, @ref, q: @q, format: :json)}',
|
||||||
commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
|
commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
|
||||||
ref: '#{@ref}',
|
ref: '#{@ref}',
|
||||||
commit_id: '#{@commit && @commit.id}'
|
commit_id: '#{@commit.id}'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue