From 4f5f7639f9b12d7f912fc72fdbc602d56e596a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 24 Aug 2023 17:21:26 +0800 Subject: [PATCH] add page exit for page_migrate --- app/controllers/projects_controller.rb | 2 ++ app/controllers/site_pages_controller.rb | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4d89cce1..446e4bb3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -100,6 +100,8 @@ class ProjectsController < ApplicationController def page_migrate return normal_status(-1, "您还未开通Page服务，无法进行新建站点") unless current_user.id_card_verify + return normal_status(-1, "你已使用了 #{page_site_params[:identifier]} 作为page标识") if Page.exists?(identifier: page_site_params[:identifier], user: current_user) + Projects::MigrateForm.new(mirror_params).validate! @project = diff --git a/app/controllers/site_pages_controller.rb b/app/controllers/site_pages_controller.rb index 91821abc..5cdc4ba2 100644 --- a/app/controllers/site_pages_controller.rb +++ b/app/controllers/site_pages_controller.rb @@ -17,7 +17,6 @@ class SitePagesController < ApplicationController end def create - return normal_status(-1, "你还未通过身份认证，无法开通Page") unless current_user.id_card_verify return normal_status(-1, "你还未开通Page服务，无法进行部署") unless current_user.website_permission return normal_status(-1, "你已使用了 #{params[:identifier]} 作为page标识") if Page.exists?(identifier: params[:identifier], user: current_user) return normal_status(-1, "该仓库已开通Page服务") if Page.exists?(project: @project)