diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 2ef79a8e9..f60761c39 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -12,14 +12,14 @@ class Admins::ProjectsController < Admins::BaseController def destroy project = Project.find_by!(id: params[:id]) ActiveRecord::Base.transaction do - g = Gitlab.client - g.delete_project(project.gpid) - # 删除Trustie版本库记录 - repoisitory = Repository.where(project_id: project.id, type: "Repository::Gitlab").first - repoisitory.destroy! - Tiding.where(container_id: project.id, container_type: ["JoinProject", "DealProject", "ReporterJoinProject", "ManagerJoinProject"]).destroy_all + Gitea::Repository::DeleteService.new(project.owner, project.identifier).call project.destroy! - render_delete_success + # render_delete_success + redirect_to admins_projects_path + flash[:success] = "删除成功" + rescue Exception => e + redirect_to admins_projects_path + flash[:danger] = "删除失败" end end end \ No newline at end of file diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 831938dca..e84cdc18f 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -30,7 +30,7 @@ class Projects::CreateService < ApplicationService description: params[:description], project_category_id: params[:project_category_id], project_language_id: params[:project_language_id], - is_public: get_is_public, + is_public: repo_is_public, ignore_id: params[:ignore_id], license_id: params[:license_id], identifier: params[:repository_name] #新增,hs @@ -39,7 +39,7 @@ class Projects::CreateService < ApplicationService def repository_params { - hidden: repo_is_public, + hidden: get_is_public, user_id: params[:user_id], identifier: params[:repository_name] } diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index 90c328792..d092134ca 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -1,49 +1,49 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - <% if projects.present? %> + <% if projects.present? %> <% projects.each_with_index do |project, index| %> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <% end %> - <% else %> + <% else %> <%= render 'admins/shared/no_data_for_table' %> - <% end %> + <% end %>
序号ID项目名称公开issue资源版本库PullRequest里程碑成员管理员<%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %>操作
序号ID项目名称公开issue资源版本库PullRequest里程碑成员管理员<%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %>操作
<%= list_index_no((params[:page] || 1).to_i, index) %><%= project.id %> - <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %> - <%= project.is_public ? '√' : '' %><%= project.issues.size %><%= project.attachments.size %><%= project.project_score.try(:changeset_num).to_i %><%= project.project_score.try(:pull_request_num).to_i %><%= project.versions.size %><%= project.members.size %> - <%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %> - <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> - <%= delete_link '删除', admins_project_path(project, element: ".project-item-#{project.id}"), class: 'delete-project-action' %> -
<%= list_index_no((params[:page] || 1).to_i, index) %><%= project.id %> + <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %> + <%= project.is_public ? '√' : '' %><%= project.issues.size %><%= project.attachments.size %><%= project.project_score.try(:changeset_num).to_i %><%= project.project_score.try(:pull_request_num).to_i %><%= project.versions.size %><%= project.members.size %> + <%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %> + <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> + <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗?"}, class: "delete-project-action" %> +