update
This commit is contained in:
parent
477b21e633
commit
bd441d024b
|
@ -32,11 +32,8 @@ class SitePagesController < ApplicationController
|
||||||
@page = Page.find params[:id]
|
@page = Page.find params[:id]
|
||||||
return normal_status(-1, @page.state_description) unless @page.state
|
return normal_status(-1, @page.state_description) unless @page.state
|
||||||
response_str = @page.deploy_page(params[:branch])
|
response_str = @page.deploy_page(params[:branch])
|
||||||
data = JSON.parse(response_str)["result"]
|
data = JSON.parse(response_str)["result"] || data = JSON.parse(response_str)["error"]
|
||||||
if data.nil?
|
if data.to_s.include?("部署成功")
|
||||||
data = JSON.parse(response_str)["error"]
|
|
||||||
end
|
|
||||||
if data.include?("部署成功")
|
|
||||||
@page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
|
@page.update(last_build_at: Time.now, build_state: true, last_build_info: data)
|
||||||
else
|
else
|
||||||
@page.update(build_state:false, last_build_info: data)
|
@page.update(build_state:false, last_build_info: data)
|
||||||
|
|
Loading…
Reference in New Issue