jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决output不换行问题

This commit is contained in:
huang 2018-06-10 21:58:11 +08:00
parent c4c4a7655b
commit 9d21ea7746
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/pull_requests_controller.rb
View File

@ -220,19 +220,6 @@ class PullRequestsController < ApplicationController
# connect jenkins
client_jenkins = JenkinsApi::Client.new(:server_url => jenkins_address, :username => jenkins_username, :password => jenkins_password)
@output = client_jenkins.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'html')["output"]
pr.update_column(:jenkins_output, @output)
# @output2 = @output.gsub("\n", "\r\n")
# @output2 = @output.gsub("\n", "\r")
@output3 = @output.gsub("\r\n", "</br>")
@output4 = @output.gsub("\n", "</br>")
# @output4 = @output.gsub("\r\n", "\r")
# @output5 = @output.gsub("\r", "\n")
# @output6 = @output.gsub("\r", "\r\n")
# @output7 = @output.gsub("\t", "\t\n")
# @output8 = @output.gsub("\t", "\n")
# @output9 = @output.gsub("\t", "\r")
logger.info("jenkins ###########################{@output}")
logger.info("jenkins 1111111111111111111111111##{@output2}")
end

13
app/views/pull_requests/pr_console.html.erb
View File

@ -3,16 +3,3 @@
<pre><%= @output.html_safe %></pre>
</div>
</div>
<div class="clear new_roadmap_listbox">
<div class="clear">
<%= @output3.html_safe %>
</div>
</div>
<div class="clear new_roadmap_listbox">
<div class="clear">
<%= @output4.html_safe %>
</div>
</div>