Browse Source

render_error替换成tip_exception

pull/313/head
xiaoxiaoqiong 4 years ago
parent
commit
17fb43cea8
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/controllers/ci/projects_controller.rb

+ 2
- 2
app/controllers/ci/projects_controller.rb View File

@@ -41,7 +41,7 @@ class Ci::ProjectsController < Ci::BaseController
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
if @repo if @repo
@repo.destroy! if @repo&.repo_user_id == 0 @repo.destroy! if @repo&.repo_user_id == 0
return render_error('该项目已经激活') if @repo.repo_active?
return tip_exception('该项目已经激活') if @repo.repo_active?
@repo.activate!(@project) @repo.activate!(@project)
else else
@repo = Ci::Repo.auto_create!(@ci_user, @project) @repo = Ci::Repo.auto_create!(@ci_user, @project)
@@ -55,7 +55,7 @@ class Ci::ProjectsController < Ci::BaseController
end end
render_ok render_ok
rescue Exception => ex rescue Exception => ex
render_error(ex.message)
tip_exception(ex.message)
end end
end end




Loading…
Cancel
Save