From d21df48961a15f8ffa412c1b543dc4d76c542c29 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 14 Jun 2016 14:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=BC=B9=E6=A1=86=E5=8F=8A=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 8 +++++--- app/views/repositories/_quality_analyses.html.erb | 5 +++++ app/views/repositories/quality_analyses.js.erb | 8 ++++++++ app/views/repositories/show.html.erb | 5 ++--- 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 app/views/repositories/_quality_analyses.html.erb create mode 100644 app/views/repositories/quality_analyses.js.erb diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 555b46051..9dbf7cfd7 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -308,13 +308,15 @@ update end def quality_analyses + language = params[:language] + branch = params[:branch] + path = params[:path] + user_name = User.find(@project.user_id).try(:login) + rep_name = params[:repository_id] host = "192.168.0.200" port = "1125" username = "git" password = "123123" - ##显示文件和系统版本 - user_name = User.find(@project.user_id).try(:login) - rep_name = params[:repository_id] server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name # 连接到远程主机 foobar ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh| diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb new file mode 100644 index 000000000..7424e0369 --- /dev/null +++ b/app/views/repositories/_quality_analyses.html.erb @@ -0,0 +1,5 @@ +<%= form_tag( url_for(:controller => 'repositories', :action => 'quality_analyses'), :remote => true , :method => 'post', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %> + + <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %> + <%= select_tag :language, options_for_select(["Java","C"]), :id => 'branch' %> +<% end %> \ No newline at end of file diff --git a/app/views/repositories/quality_analyses.js.erb b/app/views/repositories/quality_analyses.js.erb new file mode 100644 index 000000000..89d8685cf --- /dev/null +++ b/app/views/repositories/quality_analyses.js.erb @@ -0,0 +1,8 @@ +$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analyses', :locals => {}) %>'); +showModal('ajax-modal', '615px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9"); +$('#ajax-modal').parent().addClass("popbox_polls"); + + diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index bbcb48bdf..d1c041d73 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -2,7 +2,7 @@

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

ZIP下载 - <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier) %> + <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
@@ -46,7 +46,7 @@
<%= @changesets_latest_coimmit.message %>
<% else %> - +
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>:
<%= @changesets_latest_coimmit.message %>
@@ -58,7 +58,6 @@ <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %> 提交 -
<% end %>