floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_chain' into dev_devops

This commit is contained in:
sylor_huang@126.com 2020-07-15 16:06:31 +08:00
parent 2db35b6d40 f71e65f600
commit 86fc1efb67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/sync_forge_controller.rb
View File

@ -9,12 +9,12 @@ class SyncForgeController < ApplicationController
#以前已同步的项目,那么肯定存在仓库
user_projects = Project.where(user_id: project_user.id)
if user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier]).present?
if user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present?
has_project = true
project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first
project = user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier])&.first
elsif user_projects.where(id: sync_params[:id]).present?
has_project = true
project = user_projects.where(id: sync_params[:id]))&.first
project = user_projects.where(id: sync_params[:id])&.first
elsif user_projects.where(identifier: sync_params[:identifier]).present?
has_project = true
project = user_projects.where(identifier: sync_params[:identifier])&.first