Browse Source

Merge pull request '新建站点增加限制' (#125) from KingChan/forgeplus:chenjing into standalone_develop

pull/338/head
KingChan 2 years ago
parent
commit
5bcc963530
2 changed files with 2 additions and 1 deletions
  1. +2
    -0
      app/controllers/projects_controller.rb
  2. +0
    -1
      app/controllers/site_pages_controller.rb

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

@@ -100,6 +100,8 @@ class ProjectsController < ApplicationController


def page_migrate def page_migrate
return normal_status(-1, "您还未开通Page服务,无法进行新建站点") unless current_user.id_card_verify 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! Projects::MigrateForm.new(mirror_params).validate!


@project = @project =


+ 0
- 1
app/controllers/site_pages_controller.rb View File

@@ -17,7 +17,6 @@ class SitePagesController < ApplicationController
end end
def create 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, "你还未开通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, "你已使用了 #{params[:identifier]} 作为page标识") if Page.exists?(identifier: params[:identifier], user: current_user)
return normal_status(-1, "该仓库已开通Page服务") if Page.exists?(project: @project) return normal_status(-1, "该仓库已开通Page服务") if Page.exists?(project: @project)


Loading…
Cancel
Save