diff --git a/Gemfile b/Gemfile index 811fabc41..4e7d9d77b 100644 --- a/Gemfile +++ b/Gemfile @@ -141,4 +141,4 @@ gem 'doorkeeper' gem 'doorkeeper-jwt' -gem 'gitea-client', '~> 1.5.7' +gem 'gitea-client', '~> 1.5.8' diff --git a/app/controllers/admins/base_controller.rb b/app/controllers/admins/base_controller.rb index fbfc3fc41..e2882978b 100644 --- a/app/controllers/admins/base_controller.rb +++ b/app/controllers/admins/base_controller.rb @@ -23,10 +23,23 @@ class Admins::BaseController < ApplicationController def require_admin! return if current_user.blank? || !current_user.logged? return if current_user.admin_or_business? + return if current_user.admin_or_glcc_admin? render_forbidden end + def require_admin + render_forbidden unless User.current.admin? + end + + def require_business + render_forbidden unless admin_or_business? + end + + def require_glcc_admin + render_forbidden unless admin_or_glcc_admin? + end + # 触发after ajax render partial hooks，执行一些因为局部刷新后失效的绑定事件 def rebind_event_if_ajax_render_partial return if request.format.symbol != :js diff --git a/app/controllers/admins/edu_settings_controller.rb b/app/controllers/admins/edu_settings_controller.rb index 9d9334b23..8d9985998 100644 --- a/app/controllers/admins/edu_settings_controller.rb +++ b/app/controllers/admins/edu_settings_controller.rb @@ -1,4 +1,5 @@ class Admins::EduSettingsController < Admins::BaseController + before_action :require_admin before_action :find_setting, only: [:edit,:update, :destroy] def index diff --git a/app/controllers/admins/faqs_controller.rb b/app/controllers/admins/faqs_controller.rb index 250d3d60a..c16cca934 100644 --- a/app/controllers/admins/faqs_controller.rb +++ b/app/controllers/admins/faqs_controller.rb @@ -1,4 +1,5 @@ class Admins::FaqsController < Admins::BaseController + before_action :require_business before_action :find_faq, only: [:edit,:update, :destroy] def index diff --git a/app/controllers/admins/feedbacks_controller.rb b/app/controllers/admins/feedbacks_controller.rb index ff64ae5a1..59515ad2a 100644 --- a/app/controllers/admins/feedbacks_controller.rb +++ b/app/controllers/admins/feedbacks_controller.rb @@ -1,4 +1,5 @@ class Admins::FeedbacksController < Admins::BaseController + before_action :require_business before_action :get_feedback, only: [:new_history, :create_history, :destroy] def index diff --git a/app/controllers/admins/glcc_pr_check_controller.rb b/app/controllers/admins/glcc_pr_check_controller.rb index 1d79ba802..8d6d9dd70 100644 --- a/app/controllers/admins/glcc_pr_check_controller.rb +++ b/app/controllers/admins/glcc_pr_check_controller.rb @@ -1,4 +1,6 @@ class Admins::GlccPrCheckController < Admins::BaseController + before_action :require_glcc_admin + def index params[:sort_by] = params[:sort_by].presence || 'created_on' params[:sort_direction] = params[:sort_direction].presence || 'desc' diff --git a/app/controllers/admins/identity_verifications_controller.rb b/app/controllers/admins/identity_verifications_controller.rb index 1db1a9883..aec9aee61 100644 --- a/app/controllers/admins/identity_verifications_controller.rb +++ b/app/controllers/admins/identity_verifications_controller.rb @@ -1,4 +1,5 @@ class Admins::IdentityVerificationsController < Admins::BaseController + before_action :require_business before_action :finder_identity_verification, except: [:index] def index params[:sort_by] = params[:sort_by].presence || 'created_at' diff --git a/app/controllers/admins/issues_rank_controller.rb b/app/controllers/admins/issues_rank_controller.rb index 79450fbfb..53be77a4d 100644 --- a/app/controllers/admins/issues_rank_controller.rb +++ b/app/controllers/admins/issues_rank_controller.rb @@ -1,4 +1,5 @@ class Admins::IssuesRankController < Admins::BaseController + before_action :require_admin def index @statistics = DailyProjectStatistic.where('date >= ? AND date <= ?', begin_date, end_date) diff --git a/app/controllers/admins/laboratories_controller.rb b/app/controllers/admins/laboratories_controller.rb index 7044b6218..e201372c5 100644 --- a/app/controllers/admins/laboratories_controller.rb +++ b/app/controllers/admins/laboratories_controller.rb @@ -1,4 +1,5 @@ class Admins::LaboratoriesController < Admins::BaseController + before_action :require_admin def index default_sort('id', 'desc') diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb index abe332ac5..502adbed1 100644 --- a/app/controllers/admins/message_templates_controller.rb +++ b/app/controllers/admins/message_templates_controller.rb @@ -1,4 +1,5 @@ class Admins::MessageTemplatesController < Admins::BaseController + before_action :require_admin before_action :get_template, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb index 8b3d828ff..bfb72f730 100644 --- a/app/controllers/admins/nps_controller.rb +++ b/app/controllers/admins/nps_controller.rb @@ -1,4 +1,5 @@ class Admins::NpsController < Admins::BaseController + before_action :require_business def index @on_off_switch = EduSetting.get("nps-on-off-switch").to_s == 'true' @user_nps = UserNp.joins(:user).order(created_at: :desc) diff --git a/app/controllers/admins/organizations_controller.rb b/app/controllers/admins/organizations_controller.rb index 3d4eac4c6..0b0e60966 100644 --- a/app/controllers/admins/organizations_controller.rb +++ b/app/controllers/admins/organizations_controller.rb @@ -1,5 +1,6 @@ class Admins::OrganizationsController < Admins::BaseController - before_action :finder_org, except: [:index] + before_action :require_admin + before_action :finder_org, except: [:index] def index params[:sort_by] = params[:sort_by].presence || 'created_on' diff --git a/app/controllers/admins/page_themes_controller.rb b/app/controllers/admins/page_themes_controller.rb index 1b2cd8ebe..025fa5106 100644 --- a/app/controllers/admins/page_themes_controller.rb +++ b/app/controllers/admins/page_themes_controller.rb @@ -1,4 +1,5 @@ class Admins::PageThemesController < Admins::BaseController + before_action :require_admin before_action :finder_page_theme, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 72cb833fa..2a518cfa0 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectCategoriesController < Admins::BaseController + before_action :require_admin before_action :get_category, only: [:edit,:update, :destroy] before_action :validate_names, only: [:create, :update] diff --git a/app/controllers/admins/project_ignores_controller.rb b/app/controllers/admins/project_ignores_controller.rb index 6450f6afc..5153bf23f 100644 --- a/app/controllers/admins/project_ignores_controller.rb +++ b/app/controllers/admins/project_ignores_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectIgnoresController < Admins::BaseController + before_action :require_admin before_action :set_ignore, only: [:edit,:update, :destroy,:show] # before_action :validate_params, only: [:create, :update] diff --git a/app/controllers/admins/project_languages_controller.rb b/app/controllers/admins/project_languages_controller.rb index 69594eb50..34b787563 100644 --- a/app/controllers/admins/project_languages_controller.rb +++ b/app/controllers/admins/project_languages_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectLanguagesController < Admins::BaseController + before_action :require_admin before_action :get_language, only: [:edit,:update, :destroy] before_action :validate_names, only: [:create, :update] diff --git a/app/controllers/admins/project_licenses_controller.rb b/app/controllers/admins/project_licenses_controller.rb index 44ae75118..d573d3c23 100644 --- a/app/controllers/admins/project_licenses_controller.rb +++ b/app/controllers/admins/project_licenses_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectLicensesController < Admins::BaseController + before_action :require_admin before_action :set_license, only: [:edit,:update, :destroy,:show] # before_action :validate_params, only: [:create, :update] diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 926ab8a29..f5f210a0d 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectsController < Admins::BaseController + before_action :require_admin before_action :find_project, only: [:edit, :update] def index @@ -6,6 +7,16 @@ class Admins::ProjectsController < Admins::BaseController sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' search = params[:search].to_s.strip projects = Project.where("name like ? OR identifier LIKE ?", "%#{search}%", "%#{search}%").order("#{sort_by} #{sort_direction}") + case params[:category] + when 'public' + projects = projects.where(is_public: true) + when 'private' + projects = projects.where(is_public: false) + when 'fork' + projects = projects.where.not(forked_from_project_id: nil) + when 'original' + projects = projects.where(forked_from_project_id: nil, project_type: 'common') + end @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) end @@ -32,8 +43,12 @@ class Admins::ProjectsController < Admins::BaseController def destroy project = Project.find_by!(id: params[:id]) ActiveRecord::Base.transaction do + close_fork_pull_requests_by(project) Gitea::Repository::DeleteService.new(project.owner, project.identifier, current_user.gitea_token).call project.destroy! + project.forked_projects.update_all(forked_from_project_id: nil) + # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量 + project.project_category.decrement!(:private_projects_count, 1) if project.project_category.present? && !project.is_public # render_delete_success UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json) redirect_to admins_projects_path @@ -52,4 +67,19 @@ class Admins::ProjectsController < Admins::BaseController def project_update_params params.require(:project).permit(:is_pinned, :recommend, :recommend_index) end + + def close_fork_pull_requests_by(project) + open_pull_requests = PullRequest.where(fork_project_id: project.id) + if open_pull_requests.present? + open_pull_requests.each do |pull_request| + closed = PullRequests::CloseService.call(pull_request&.project.owner, pull_request&.project.repository, pull_request, current_user) + if closed === true + pull_request.project_trends.create!(user: current_user, project: pull_request&.project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + pull_request.issue&.update_attributes!({status_id:5}) + SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu? + end + end + end + end end \ No newline at end of file diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb index 8db0961b7..55dde85e9 100644 --- a/app/controllers/admins/projects_rank_controller.rb +++ b/app/controllers/admins/projects_rank_controller.rb @@ -1,4 +1,6 @@ class Admins::ProjectsRankController < Admins::BaseController + before_action :require_admin + def index @statistics = DailyProjectStatistic.where("date >= ? AND date <= ?", begin_date, end_date) @statistics = @statistics.group(:project_id).select("project_id, @@ -10,7 +12,7 @@ class Admins::ProjectsRankController < Admins::BaseController sum(issues) as issues, sum(pullrequests) as pullrequests, sum(commits) as commits").includes(:project) - @statistics = @statistics.order("#{sort_by} #{sort_direction}") + @statistics = paginate @statistics.order("#{sort_by} #{sort_direction}") export_excel(@statistics.limit(50)) end diff --git a/app/controllers/admins/reversed_keywords_controller.rb b/app/controllers/admins/reversed_keywords_controller.rb index 8a8442f72..0184c542d 100644 --- a/app/controllers/admins/reversed_keywords_controller.rb +++ b/app/controllers/admins/reversed_keywords_controller.rb @@ -1,4 +1,5 @@ class Admins::ReversedKeywordsController < Admins::BaseController + before_action :require_admin before_action :get_keyword, only: [:edit,:update, :destroy] # before_action :validate_identifer, only: [:create, :update] diff --git a/app/controllers/admins/site_pages_controller.rb b/app/controllers/admins/site_pages_controller.rb index 306c91627..24b605247 100644 --- a/app/controllers/admins/site_pages_controller.rb +++ b/app/controllers/admins/site_pages_controller.rb @@ -1,4 +1,5 @@ class Admins::SitePagesController < Admins::BaseController + before_action :require_admin before_action :finder_site_page, except: [:index] def index diff --git a/app/controllers/admins/sites_controller.rb b/app/controllers/admins/sites_controller.rb index f3da4ccf2..56252b1c4 100644 --- a/app/controllers/admins/sites_controller.rb +++ b/app/controllers/admins/sites_controller.rb @@ -1,4 +1,5 @@ class Admins::SitesController < Admins::BaseController + before_action :require_admin before_action :find_site, only: [:edit,:update, :destroy] def index diff --git a/app/controllers/admins/system_notifications_controller.rb b/app/controllers/admins/system_notifications_controller.rb index 33f3f20f1..1127b81fe 100644 --- a/app/controllers/admins/system_notifications_controller.rb +++ b/app/controllers/admins/system_notifications_controller.rb @@ -1,4 +1,5 @@ class Admins::SystemNotificationsController < Admins::BaseController + before_action :require_business before_action :get_notification, only: [:history, :edit,:update, :destroy] # before_action :validate_identifer, only: [:create, :update] diff --git a/app/controllers/admins/topic/activity_forums_controller.rb b/app/controllers/admins/topic/activity_forums_controller.rb index b027dc003..76a14027f 100644 --- a/app/controllers/admins/topic/activity_forums_controller.rb +++ b/app/controllers/admins/topic/activity_forums_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::ActivityForumsController < Admins::Topic::BaseController + before_action :require_business before_action :find_activity_forum, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/banners_controller.rb b/app/controllers/admins/topic/banners_controller.rb index c0350e355..66596792a 100644 --- a/app/controllers/admins/topic/banners_controller.rb +++ b/app/controllers/admins/topic/banners_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::BannersController < Admins::Topic::BaseController + before_action :require_business before_action :find_banner, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/cards_controller.rb b/app/controllers/admins/topic/cards_controller.rb index 732f17e5b..ce14f192b 100644 --- a/app/controllers/admins/topic/cards_controller.rb +++ b/app/controllers/admins/topic/cards_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::CardsController < Admins::Topic::BaseController + before_action :require_business before_action :find_card, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/cooperators_controller.rb b/app/controllers/admins/topic/cooperators_controller.rb index a1a700cbc..354188132 100644 --- a/app/controllers/admins/topic/cooperators_controller.rb +++ b/app/controllers/admins/topic/cooperators_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::CooperatorsController < Admins::Topic::BaseController + before_action :require_business before_action :find_cooperator, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/excellent_projects_controller.rb b/app/controllers/admins/topic/excellent_projects_controller.rb index b60dac54c..3f8f3006b 100644 --- a/app/controllers/admins/topic/excellent_projects_controller.rb +++ b/app/controllers/admins/topic/excellent_projects_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::ExcellentProjectsController < Admins::Topic::BaseController + before_action :require_business before_action :find_excellent_project, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/experience_forums_controller.rb b/app/controllers/admins/topic/experience_forums_controller.rb index 420670c1b..59b4e20e6 100644 --- a/app/controllers/admins/topic/experience_forums_controller.rb +++ b/app/controllers/admins/topic/experience_forums_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::ExperienceForumsController < Admins::Topic::BaseController + before_action :require_business before_action :find_experience_forum, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/glcc_news_controller.rb b/app/controllers/admins/topic/glcc_news_controller.rb index 3c1769e5f..6252b6d91 100644 --- a/app/controllers/admins/topic/glcc_news_controller.rb +++ b/app/controllers/admins/topic/glcc_news_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::GlccNewsController < Admins::Topic::BaseController + before_action :require_glcc_admin before_action :find_glcc, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/topic/pinned_forums_controller.rb b/app/controllers/admins/topic/pinned_forums_controller.rb index ac5bf69a7..50577ea95 100644 --- a/app/controllers/admins/topic/pinned_forums_controller.rb +++ b/app/controllers/admins/topic/pinned_forums_controller.rb @@ -1,4 +1,5 @@ class Admins::Topic::PinnedForumsController < Admins::Topic::BaseController + before_action :require_business before_action :find_pinned_forum, only: [:edit, :update, :destroy] def index diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb index e15e39242..e544cfb8e 100644 --- a/app/controllers/admins/users_controller.rb +++ b/app/controllers/admins/users_controller.rb @@ -1,4 +1,5 @@ class Admins::UsersController < Admins::BaseController + before_action :require_admin before_action :finder_user, except: [:index] def index @@ -73,6 +74,6 @@ class Admins::UsersController < Admins::BaseController def update_params params.require(:user).permit(%i[lastname nickname gender technical_title is_shixun_marker mail phone location location_city school_id department_id admin - password login website_permission]) + password login website_permission business glcc_admin]) end end diff --git a/app/controllers/admins/users_rank_controller.rb b/app/controllers/admins/users_rank_controller.rb index 2c7a62ae5..24407257c 100644 --- a/app/controllers/admins/users_rank_controller.rb +++ b/app/controllers/admins/users_rank_controller.rb @@ -1,4 +1,5 @@ class Admins::UsersRankController < Admins::BaseController + before_action :require_admin def index @rank_date = rank_date diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb index ff7c28e85..9d0cdb8b0 100644 --- a/app/controllers/api/v1/projects/actions/runs_controller.rb +++ b/app/controllers/api/v1/projects/actions/runs_controller.rb @@ -5,6 +5,17 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B puts @result_object end + def create + return render_error("请输入正确的流水线文件！") if params[:workflow].blank? + return render_error("请输入正确的分支！") if params[:ref].blank? + gitea_result = $gitea_hat_client.post_repos_actions_runs_by_owner_repo(@project&.owner&.login, @project&.identifier, {query: {workflow: params[:workflow], ref: params[:ref]}}) + if gitea_result + render_ok + else + ender_error("启动流水线任务失败") + end + end + def rerun return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank? gitea_result = $gitea_hat_client.post_repos_actions_runs_rerun_by_owner_repo_run(@project&.owner&.login, @project&.identifier, params[:run_id]) rescue nil diff --git a/app/controllers/api/v1/users/home_top_settings_controller.rb b/app/controllers/api/v1/users/home_top_settings_controller.rb new file mode 100644 index 000000000..d329c7e69 --- /dev/null +++ b/app/controllers/api/v1/users/home_top_settings_controller.rb @@ -0,0 +1,23 @@ +class Api::V1::Users::HomeTopSettingsController < Api::V1::BaseController + + before_action :load_observe_user + before_action :check_auth_for_observe_user + + def create + @result = Api::V1::Users::HomeTopSettings::CreateService.call(@observe_user, home_top_setting_params) + return render_error("置顶失败.") if @result.nil? + return render_ok + end + + def cancel + @result = Api::V1::Users::HomeTopSettings::DeleteService.call(@observe_user, home_top_setting_params) + return render_error("取消置顶失败.") if @result.nil? + return render_ok + end + + private + def home_top_setting_params + params.permit(:top_type, :top_id) + end + +end \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c134a3bd..6957922d4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -75,7 +75,11 @@ class ApplicationController < ActionController::Base def admin_or_business? - User.current.admin? || User.current.business? + User.current.admin? || User.current.business? + end + + def admin_or_glcc_admin? + User.current.admin? || User.current.glcc_admin? end # 判断用户的邮箱或者手机是否可用 @@ -195,6 +199,10 @@ class ApplicationController < ActionController::Base normal_status(403, "") unless admin_or_business? end + def require_glcc_admin + normal_status(403, "") unless admin_or_glcc_admin? + end + # 前端会捕捉401,弹登录弹框 # 未授权的捕捉407，弹试用申请弹框 def require_login diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fa83f6e5c..d3e308450 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -64,7 +64,8 @@ class ProjectsController < ApplicationController end rescue Gitea::Api::ServerError => ex uid_logger_error(ex.message) - tip_exception(ex.http_code, ex.message) + # tip_exception(ex.http_code, ex.message) + tip_exception(ex.message) rescue ApplicationService::Error => e uid_logger_error(e.message) tip_exception(e.message) @@ -216,6 +217,10 @@ class ProjectsController < ApplicationController new_project_params = project_params.except(:private).merge(is_public: !private) @project.update_attributes!(new_project_params) + fork_pull_requests = PullRequest.where(fork_project_id: @project.id) + if fork_pull_requests.present? + fork_pull_requests.update_all(fork_project_identifier: @project.identifier) + end @project.forked_projects.map{|p| p.update!(is_public: @project.is_public)} gitea_params = { private: private, @@ -257,6 +262,7 @@ class ProjectsController < ApplicationController def destroy if current_user.admin? || @project.manager?(current_user) ActiveRecord::Base.transaction do + close_fork_pull_requests_by(@project) Gitea::Repository::DeleteService.new(@project.owner, @project.identifier,current_user.gitea_token).call @project.destroy! @project.forked_projects.update_all(forked_from_project_id: nil) @@ -407,4 +413,19 @@ class ProjectsController < ApplicationController render_unauthorized('你还未登录.') end end + + def close_fork_pull_requests_by(project) + open_pull_requests = PullRequest.where(fork_project_id: project.id) + if open_pull_requests.present? + open_pull_requests.each do |pull_request| + closed = PullRequests::CloseService.call(pull_request&.project.owner, pull_request&.project.repository, pull_request, current_user) + if closed === true + pull_request.project_trends.create!(user: current_user, project: pull_request&.project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + pull_request.issue&.update_attributes!({status_id:5}) + SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu? + end + end + end + end end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index a71c2ff1a..536bda3a8 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -7,6 +7,7 @@ class RepositoriesController < ApplicationController before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror] before_action :require_profile_completed, only: [:create_file] before_action :load_repository + before_action :require_operate_above, only: %i[create_file update_file replace_file delete_file] before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive] before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror] before_action :get_ref, only: %i[entries sub_entries top_counts files archive] @@ -437,4 +438,8 @@ class RepositoriesController < ApplicationController end end + def require_operate_above + return render_forbidden if !current_user.admin? && !@project.operator?(current_user) + end + end diff --git a/app/controllers/users/organizations_controller.rb b/app/controllers/users/organizations_controller.rb index 2d949da7d..2d80adb9b 100644 --- a/app/controllers/users/organizations_controller.rb +++ b/app/controllers/users/organizations_controller.rb @@ -10,7 +10,15 @@ class Users::OrganizationsController < Users::BaseController end @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present? - @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}") + + @home_top_ids = @organizations.joins(:home_top_settings).where(home_top_settings: {user_id: observed_user.id}).order("home_top_settings.created_at asc").pluck(:id) + + if @home_top_ids.present? + @organizations = @organizations.joins(:organization_extension).order("FIELD(users.id, #{@home_top_ids.join(",")}) desc, organization_extensions.#{sort_by} #{sort_direction}") + else + @organizations = @organizations.joins(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}") + end + @organizations = kaminari_paginate(@organizations) end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b976ee8fa..27895a758 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -408,7 +408,7 @@ class UsersController < ApplicationController def projects is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == @user.id) - scope = Projects::ListMyQuery.call(params, @user,is_current_admin_user) + scope, @home_top_ids = Projects::ListMyQuery.call(params, @user,is_current_admin_user) @total_count = scope.size @projects = kaminari_unlimit_paginate(scope) end diff --git a/app/forms/base_form.rb b/app/forms/base_form.rb index 44b5109c3..19af61026 100644 --- a/app/forms/base_form.rb +++ b/app/forms/base_form.rb @@ -26,6 +26,16 @@ class BaseForm raise "项目标识已被使用." if Repository.where(user_id: user_id, identifier: repository_name.strip).exists? end + def check_gitea_repository_name(user_id, repository_name) + user_login = User.find_by_id(user_id)&.login + begin + gitea_result = $gitea_client.get_repos_by_owner_repo(user_login, repository_name) + raise "项目标识已被使用." if gitea_result["id"].present? + rescue Gitea::Api::ServerError => e + raise "服务器错误，请联系系统管理员！" unless e.http_code.to_i == 404 + end + end + def check_project_name(user_id, project_name) raise "项目名称已被使用." if Project.where(user_id: user_id, name: project_name.strip).exists? end diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb index 8ef7befac..d2d83bce9 100644 --- a/app/forms/projects/create_form.rb +++ b/app/forms/projects/create_form.rb @@ -16,6 +16,7 @@ class Projects::CreateForm < BaseForm check_project_language(project_language_id) check_project_name(user_id, name) unless name.blank? check_repository_name(user_id, repository_name) unless repository_name.blank? + # check_gitea_repository_name(user_id, repository_name) unless repository_name.blank? check_blockchain_token_all(blockchain_token_all) unless blockchain_token_all.blank? check_blockchain_init_token(blockchain_init_token) unless blockchain_init_token.blank? end diff --git a/app/forms/projects/migrate_form.rb b/app/forms/projects/migrate_form.rb index 98ebbc7ac..8c1d04968 100644 --- a/app/forms/projects/migrate_form.rb +++ b/app/forms/projects/migrate_form.rb @@ -11,6 +11,7 @@ class Projects::MigrateForm < BaseForm validate do check_project_name(user_id, name) unless name.blank? check_repository_name(user_id, repository_name) unless repository_name.blank? + # check_gitea_repository_name(user_id, repository_name) unless repository_name.blank? check_project_category(project_category_id) check_project_language(project_language_id) check_owner diff --git a/app/forms/projects/update_form.rb b/app/forms/projects/update_form.rb index 226b2dc59..e8d59ac7a 100644 --- a/app/forms/projects/update_form.rb +++ b/app/forms/projects/update_form.rb @@ -10,6 +10,7 @@ class Projects::UpdateForm < BaseForm check_project_language(project_language_id) check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier + # check_gitea_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier check_project_name(user_id, name) unless name.blank? || name == project_name end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5d5582428..d670e9a0d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -479,7 +479,7 @@ module ApplicationHelper return if url.blank? content_tag(:li) do - sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root') + sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root', has_permission: true) end end diff --git a/app/helpers/manage_back_helper.rb b/app/helpers/manage_back_helper.rb index ed3f13826..cb320f80f 100644 --- a/app/helpers/manage_back_helper.rb +++ b/app/helpers/manage_back_helper.rb @@ -2,29 +2,33 @@ module ManageBackHelper extend ActiveSupport::Concern def sidebar_item_group(url, text, **opts) - link_opts = url.start_with?('/') ? {} : { 'data-toggle': 'collapse', 'aria-expanded': false } - content = - link_to url, link_opts do - content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) + - content_tag(:span, text) - end + if opts[:has_permission] + link_opts = url.start_with?('/') ? {} : { 'data-toggle': 'collapse', 'aria-expanded': false } + content = + link_to url, link_opts do + content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) + + content_tag(:span, text) + end - content += - content_tag(:ul, id: url[1..-1], class: 'collapse list-unstyled', "data-parent": '#sidebar') do - yield - end + content += + content_tag(:ul, id: url[1..-1], class: 'collapse list-unstyled', "data-parent": '#sidebar') do + yield + end - raw content + raw content + end end def sidebar_item(url, text, **opts) - content = - link_to url, 'data-controller': opts[:controller] do - content_tag(:i, '', class: "fa fa-#{opts[:icon]} fa-fw", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) + - content_tag(:span, text) - end + if opts[:has_permission] + content = + link_to url, 'data-controller': opts[:controller] do + content_tag(:i, '', class: "fa fa-#{opts[:icon]} fa-fw", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) + + content_tag(:span, text) + end - raw content + raw content + end end def admin_sidebar_controller diff --git a/app/jobs/cache_async_clear_job.rb b/app/jobs/cache_async_clear_job.rb index 1d810781a..589876bc0 100644 --- a/app/jobs/cache_async_clear_job.rb +++ b/app/jobs/cache_async_clear_job.rb @@ -2,6 +2,7 @@ class CacheAsyncClearJob < ApplicationJob queue_as :cache def perform(type, id=nil) + return if id.nil? case type when "project_common_service" Cache::V2::ProjectCommonService.new(id).clear diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb index 1d6e41128..144d9a084 100644 --- a/app/jobs/migrate_remote_repository_job.rb +++ b/app/jobs/migrate_remote_repository_job.rb @@ -10,7 +10,7 @@ class MigrateRemoteRepositoryJob < ApplicationJob gitea_repository = Gitea::Repository::MigrateService.new(token, params).call puts "#gitea_repository#{gitea_repository}" if gitea_repository[0]==201 - repo&.project&.update_columns(gpid: gitea_repository[2]["id"]) + repo&.project&.update_columns(gpid: gitea_repository[2]["id"], default_branch: gitea_repository[2]["default_branch"]) repo&.mirror&.succeeded! ## open jianmu devops project_id = repo&.project&.id @@ -24,7 +24,7 @@ class MigrateRemoteRepositoryJob < ApplicationJob repo&.mirror&.failed! repo&.project&.update_columns(status: 0) else - repo&.project&.update_columns(gpid: gitea_result["id"]) + repo&.project&.update_columns(gpid: gitea_repository[2]["id"], default_branch: gitea_repository[2]["default_branch"]) repo&.mirror&.succeeded! project_id = repo&.project&.id puts "############ mirror project_id,user_id: #{project_id},#{user_id} ############" diff --git a/app/models/home_top_setting.rb b/app/models/home_top_setting.rb new file mode 100644 index 000000000..78486620f --- /dev/null +++ b/app/models/home_top_setting.rb @@ -0,0 +1,23 @@ +# == Schema Information +# +# Table name: home_top_settings +# +# id :integer not null, primary key +# user_id :integer +# top_type :string(255) +# top_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_home_top_settings_on_top_type_and_top_id (top_type,top_id) +# index_home_top_settings_on_user_id (user_id) +# + +class HomeTopSetting < ApplicationRecord + + belongs_to :user + + belongs_to :top, polymorphic: true +end diff --git a/app/models/organization.rb b/app/models/organization.rb index faa6396df..8ac1b80e6 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -76,6 +76,7 @@ class Organization < Owner has_many :team_users, dependent: :destroy has_many :pinned_projects, class_name: 'PinnedProject', foreign_key: :user_id, dependent: :destroy has_many :is_pinned_projects, through: :pinned_projects, source: :project, validate: false + has_many :home_top_settings, as: :top, dependent: :destroy validates :login, presence: true validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false diff --git a/app/models/project.rb b/app/models/project.rb index c5fb448a0..ba0cab97e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -138,6 +138,7 @@ class Project < ApplicationRecord has_many :daily_project_statistics, dependent: :destroy has_one :project_dataset, dependent: :destroy has_many :sync_repositories, dependent: :destroy + has_many :home_top_settings, as: :top, dependent: :destroy after_create :incre_user_statistic, :incre_platform_statistic after_save :check_project_members before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data @@ -181,14 +182,14 @@ class Project < ApplicationRecord end if changes[:is_public].present? if changes[:is_public][0] && !changes[:is_public][1] - CacheAsyncClearJob.perform_later('project_rank_service', self.id) + CacheAsyncClearJob.set(wait: 5.seconds).perform_later('project_rank_service', self.id) end if !changes[:is_public][0] && changes[:is_public][1] $redis_cache.srem("v2-project-rank-deleted", self.id) end end if !self.common? - CacheAsyncClearJob.perform_later('project_rank_service', self.id) + CacheAsyncClearJob.set(wait: 5.seconds).perform_later('project_rank_service', self.id) end end @@ -461,6 +462,15 @@ class Project < ApplicationRecord EduSetting.get("open_portrait_projects").present? ? EduSetting.get("open_portrait_projects").split(",").include?(self.id.to_s) : false end + def has_pull_request(branch_name) + return true if self.pull_requests.opening.where(head: branch_name).present? || self.pull_requests.opening.where(base: branch_name).present? + if self.forked_from_project_id.present? + return true if self.fork_project.pull_requests.opening.where(head: branch_name).present? || self.fork_project.pull_requests.opening.where(base: branch_name).present? + end + + return false + end + def self.mindspore_contributors cache_result = $redis_cache.get("ProjectMindsporeContributors") if cache_result.nil? diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 0142f27f6..26b4ce2c6 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -2,25 +2,27 @@ # # Table name: pull_requests # -# id :integer not null, primary key -# gitea_id :integer -# gitea_number :integer -# user_id :integer -# created_at :datetime not null -# updated_at :datetime not null -# status :integer default("0") -# project_id :integer -# title :string(255) -# milestone :integer -# body :text(4294967295) -# head :string(255) -# base :string(255) -# issue_id :integer -# fork_project_id :integer -# is_original :boolean default("0") -# comments_count :integer default("0") -# commits_count :integer default("0") -# files_count :integer default("0") +# id :integer not null, primary key +# gitea_id :integer +# gitea_number :integer +# user_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# status :integer default("0") +# project_id :integer +# title :string(255) +# milestone :integer +# body :text(4294967295) +# head :string(255) +# base :string(255) +# issue_id :integer +# fork_project_id :integer +# is_original :boolean default("0") +# comments_count :integer default("0") +# commits_count :integer default("0") +# files_count :integer default("0") +# fork_project_owner :string(255) +# fork_project_identifier :string(255) # class PullRequest < ApplicationRecord diff --git a/app/models/user.rb b/app/models/user.rb index 9d623f949..988f6d8c2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -190,6 +190,7 @@ class User < Owner has_many :clas, through: :user_clas has_one :page, :dependent => :destroy + has_many :home_top_settings, dependent: :destroy # Groups and active users scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } @@ -833,7 +834,11 @@ class User < Owner end def admin_or_business? - admin? || business? + admin? || business? + end + + def admin_or_glcc_admin? + admin? || glcc_admin? end def self.generate_login(prefix) diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 27415543d..b81d5542b 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -20,11 +20,11 @@ class Projects::ListMyQuery < ApplicationQuery if params[:category].blank? normal_projects = projects.members_projects(user.id).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct elsif params[:category].to_s == "join" normal_projects = projects.where.not(user_id: user.id).members_projects(user.id).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct elsif params[:category].to_s == "manage" projects = projects.where(user_id: user.id) elsif params[:category].to_s == "watched" #我关注的 @@ -37,7 +37,7 @@ class Projects::ListMyQuery < ApplicationQuery elsif params[:category].to_s == "admin" normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: %w(owner admin)},team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct # elsif params[:category].to_s == "public" # projects = projects.visible.joins(:members).where(members: { user_id: user.id }) # elsif params[:category].to_s == "private" @@ -71,11 +71,19 @@ class Projects::ListMyQuery < ApplicationQuery sort = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : "updated_on" sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : "desc" - + + @home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) + if params[:choosed].present? && params[:choosed].is_a?(Array) - scope.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") + scope = scope.distinct.order("FIELD(projects.id, #{params[:choosed].reverse.join(",")}) desc") else - scope.order("projects.#{sort} #{sort_direction}") + if @home_top_ids.present? + scope = scope.distinct.order("FIELD(projects.id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") + else + scope = scope.distinct.order("projects.#{sort} #{sort_direction}") + end end + + return scope, @home_top_ids end end diff --git a/app/services/admins/update_user_service.rb b/app/services/admins/update_user_service.rb index 4dd80b9d0..2d58b000f 100644 --- a/app/services/admins/update_user_service.rb +++ b/app/services/admins/update_user_service.rb @@ -31,7 +31,7 @@ class Admins::UpdateUserService < ApplicationService private def user_attributes - params.slice(*%i[lastname nickname mail phone admin business is_test login + params.slice(*%i[lastname nickname mail phone admin business glcc_admin is_test login professional_certification authentication is_shixun_marker website_permission]) end diff --git a/app/services/api/v1/users/home_top_settings/create_service.rb b/app/services/api/v1/users/home_top_settings/create_service.rb new file mode 100644 index 000000000..0c4cea59e --- /dev/null +++ b/app/services/api/v1/users/home_top_settings/create_service.rb @@ -0,0 +1,40 @@ +class Api::V1::Users::HomeTopSettings::CreateService < ApplicationService + + include ActiveModel::Model + + attr_reader :user, :top_type, :top_id + attr_accessor :home_top_setting, :home_top + + validates :user, :top_type, :top_id, presence: true + validates :top_type, inclusion: {in: %w(Organization Project), message: '请输入正确的TopType'} + + def initialize(user, params) + @user = user + @top_type = params[:top_type] + @top_id = params[:top_id] + end + + def call + raise Error, errors.full_messages.join(",") unless valid? + raise Error, "置顶对象不存在！" unless find_home_top + raise Error, "置顶对象已置顶！" if check_home_top_setting + + begin + @home_top_setting = HomeTopSetting.new(user:user, top: @home_top) + @home_top_setting.save! + + return @home_top_setting.valid? ? @home_top_setting : nil + rescue + raise Error, "服务器错误，请联系系统管理员！" + + end + end + + def find_home_top + @home_top = @top_type.constantize.find_by_id(@top_id).presence + end + + def check_home_top_setting + HomeTopSetting.exists?(user: @user, top: @home_top) + end +end \ No newline at end of file diff --git a/app/services/api/v1/users/home_top_settings/delete_service.rb b/app/services/api/v1/users/home_top_settings/delete_service.rb new file mode 100644 index 000000000..e3ce9fe1f --- /dev/null +++ b/app/services/api/v1/users/home_top_settings/delete_service.rb @@ -0,0 +1,40 @@ +class Api::V1::Users::HomeTopSettings::DeleteService < ApplicationService + + include ActiveModel::Model + + attr_reader :user, :top_type, :top_id + attr_accessor :home_top_setting, :home_top + + validates :user, :top_type, :top_id, presence: true + validates :top_type, inclusion: {in: %w(Organization Project), message: '请输入正确的TopType'} + + def initialize(user, params) + @user = user + @top_type = params[:top_type] + @top_id = params[:top_id] + end + + def call + raise Error, errors.full_messages.join(",") unless valid? + raise Error, "置顶对象不存在！" unless find_home_top + raise Error, "置顶对象未置顶！" unless check_home_top_setting + + begin + @home_top_setting = HomeTopSetting.find_by(user:user, top: @home_top) + @home_top_setting.destroy! + + return true + rescue + raise Error, "服务器错误，请联系系统管理员！" + + end + end + + def find_home_top + @home_top = @top_type.constantize.find_by_id(@top_id).presence + end + + def check_home_top_setting + HomeTopSetting.exists?(user: @user, top: @home_top) + end +end \ No newline at end of file diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 07eab8981..b83ec51d2 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -15,6 +15,7 @@ class Projects::TransferService < ApplicationService update_repo_url update_visit_teams update_fork_info + update_fork_pull_request_info end Rails.logger.info("##### Project transfer_service end ######") @@ -49,6 +50,11 @@ class Projects::TransferService < ApplicationService fork_user.update(user_id: @new_owner.id) if fork_user.present? end + def update_fork_pull_request_info + fork_pull_requests = PullRequest.where(fork_project_id: @project.id) + fork_pull_requests.update_all(fork_project_owner: @new_owner&.login) if fork_pull_requests.present? + end + def gitea_update_owner begin @gitea_repo = $gitea_hat_client.post_repos_transfer_by_owner_repo(owner&.login, project.identifier, {body: {new_owner: new_owner&.login}.to_json}) diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index 070b564d9..0010f8755 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -1,6 +1,6 @@ class PullRequests::CreateService < ApplicationService - attr_reader :current_user, :owner, :project, :params + attr_reader :current_user, :owner, :project, :params, :fork_project attr_accessor :pull_issue, :pull_request def initialize(current_user, owner, project, params) @@ -8,6 +8,7 @@ class PullRequests::CreateService < ApplicationService @project = project @params = params @current_user = current_user + @fork_project = Project.find_by_id(params[:fork_project_id]) end def call @@ -102,7 +103,9 @@ class PullRequests::CreateService < ApplicationService fork_project_id: @params[:fork_project_id], is_original: is_original, files_count: @params[:files_count] || 0, - commits_count: @params[:commits_count] || 0 + commits_count: @params[:commits_count] || 0, + fork_project_owner: @fork_project&.owner&.login, + fork_project_identifier: @fork_project&.identifier }) end diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb index 800d5f420..38b2e2cd9 100644 --- a/app/services/repositories/create_service.rb +++ b/app/services/repositories/create_service.rb @@ -38,18 +38,27 @@ class Repositories::CreateService < ApplicationService private def create_gitea_repository - if project.owner.is_a?(User) - # @gitea_repository = Gitea::Repository::CreateService.new(user.gitea_token, gitea_repository_params).call - @gitea_repository = $gitea_client.post_user_repos({query: {token: user.gitea_token}, body: gitea_repository_params.to_json}) - elsif project.owner.is_a?(Organization) - # @gitea_repository = Gitea::Organization::Repository::CreateService.call(user.gitea_token, project.owner.login, gitea_repository_params) - @gitea_repository = $gitea_client.post_orgs_repos_by_org(project.owner.login, {query: {token: user.gitea_token}, body: gitea_repository_params.to_json}) + begin + @gitea_repository = $gitea_client.get_repos_by_owner_repo(project.owner.login, params[:identifier]) + rescue Gitea::Api::ServerError => e + if e.http_code.to_i == 404 + if project.owner.is_a?(User) + # @gitea_repository = Gitea::Repository::CreateService.new(user.gitea_token, gitea_repository_params).call + @gitea_repository = $gitea_client.post_user_repos({query: {token: user.gitea_token}, body: gitea_repository_params.to_json}) + elsif project.owner.is_a?(Organization) + # @gitea_repository = Gitea::Organization::Repository::CreateService.call(user.gitea_token, project.owner.login, gitea_repository_params) + @gitea_repository = $gitea_client.post_orgs_repos_by_org(project.owner.login, {query: {token: user.gitea_token}, body: gitea_repository_params.to_json}) + end + else + raise "服务器错误，请联系系统管理员！" + end end end def sync_project if gitea_repository project.update_columns( + is_public: !gitea_repository["private"], gpid: gitea_repository["id"], identifier: repository.identifier, default_branch: gitea_repository["default_branch"], @@ -58,7 +67,7 @@ class Repositories::CreateService < ApplicationService end def sync_repository - repository.update_columns(url: remote_repository_url,) if gitea_repository + repository.update_columns(url: remote_repository_url, hidden: gitea_repository["private"]) if gitea_repository end def remote_repository_url diff --git a/app/views/admins/projects/index.html.erb b/app/views/admins/projects/index.html.erb index 35d931b02..be36229fd 100644 --- a/app/views/admins/projects/index.html.erb +++ b/app/views/admins/projects/index.html.erb @@ -3,10 +3,15 @@ <% end %>
- <%= form_tag(admins_projects_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + <%= form_tag(admins_projects_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-list-form', remote: true) do %> <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '项目名称/标识检索') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> +
+ + <% type_options = [['全部项目', ''], ['公开项目', 'public'], ['私有项目', 'private'], ['Fork项目', 'fork'], ['原创项目', 'original']] %> + <%= select_tag(:category, options_for_select(type_options, params[:category]), class: 'form-control', id: 'project-category') %> +
<% end %>
@@ -16,3 +21,9 @@
+ + \ No newline at end of file diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb index e95cfdef5..5ba24985b 100644 --- a/app/views/admins/projects_rank/shared/_data_list.html.erb +++ b/app/views/admins/projects_rank/shared/_data_list.html.erb @@ -16,7 +16,7 @@ <% statistics.each_with_index do |item, index| %> - <%= index + 1%> + <%= list_index_no((params[:page] || 1).to_i, index) %> "> <%= "#{item&.project&.owner&.real_name}/#{item&.project&.name}" %> @@ -34,4 +34,6 @@ <% end %> - \ No newline at end of file + + + <%= render partial: 'admins/shared/paginate', locals: { objects: statistics } %> \ No newline at end of file diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index f9bf9ae48..7919b12d0 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -13,85 +13,85 @@ diff --git a/app/views/admins/users/edit.html.erb b/app/views/admins/users/edit.html.erb index be952e7cb..3e7003ddf 100644 --- a/app/views/admins/users/edit.html.erb +++ b/app/views/admins/users/edit.html.erb @@ -89,6 +89,8 @@ <%= f.label :role, label: '角色' %>
<%= f.input :admin, as: :boolean, label: '管理员', checked_value: 1, unchecked_value: 0 %> + <%= f.input :business, as: :boolean, label: '运营人员', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %> + <%= f.input :glcc_admin, as: :boolean, label: 'GLCC管理员', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
<% end %> diff --git a/app/views/api/v1/projects/branches/index.json.jbuilder b/app/views/api/v1/projects/branches/index.json.jbuilder index 80b3e4d03..ec854669c 100644 --- a/app/views/api/v1/projects/branches/index.json.jbuilder +++ b/app/views/api/v1/projects/branches/index.json.jbuilder @@ -1,5 +1,5 @@ json.total_count @result_object[:total_data].to_i json.branches @result_object[:data].each do |branch| json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch, default_branch: @result_object[:default_branch] - + json.has_pull_request @project.has_pull_request(branch['name']) end \ No newline at end of file diff --git a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder b/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder index 32b384fb5..5f66ed676 100644 --- a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder +++ b/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder @@ -12,6 +12,7 @@ if tag.present? && tag.is_a?(Hash) end json.time_ago time_from_now(tag['tagger']['date'].to_time) json.created_at_unix tag['tagger']['date'].to_time.to_i + json.created_time tag['tagger']['date'].to_time json.message tag['message'] json.commit do json.sha tag['commit']['sha'] diff --git a/app/views/organizations/projects/index.json.jbuilder b/app/views/organizations/projects/index.json.jbuilder index 5a4615fc7..350967838 100644 --- a/app/views/organizations/projects/index.json.jbuilder +++ b/app/views/organizations/projects/index.json.jbuilder @@ -5,5 +5,6 @@ json.projects @projects.each do |project| json.type project.numerical_for_project_type json.praised project.praised_by?(current_user) json.last_update_time render_unix_time(project.updated_on) + json.full_last_update_time project.updated_on json.time_ago time_from_now(project.updated_on) end \ No newline at end of file diff --git a/app/views/projects/_project_detail.json.jbuilder b/app/views/projects/_project_detail.json.jbuilder index c5b071abf..59160822f 100644 --- a/app/views/projects/_project_detail.json.jbuilder +++ b/app/views/projects/_project_detail.json.jbuilder @@ -13,6 +13,7 @@ json.is_public project.is_public json.mirror_url project.repository&.mirror_url json.type project&.numerical_for_project_type json.last_update_time render_unix_time(project.updated_on) +json.full_last_update_time project.updated_on json.time_ago time_from_now(project.updated_on) json.forked_from_project_id project.forked_from_project_id json.open_devops project.open_devops? diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index a07dd6c1a..7841f4564 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -13,6 +13,7 @@ json.projects @projects do |project| json.mirror_url project.repository&.mirror_url json.type project&.numerical_for_project_type json.last_update_time render_unix_time(project.updated_on) + json.full_last_update_time project.updated_on json.time_ago time_from_now(project.updated_on) json.forked_from_project_id project.forked_from_project_id json.open_devops project.open_devops? diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 07c4b322b..3a35772f0 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -23,15 +23,16 @@ json.issues do json.pull_request_base pr.base json.pull_request_staus pr.status == 1 ? "merged" : (pr.status == 2 ? "closed" : "open") json.is_original pr.is_original - json.fork_project_id pr.fork_project_id.present? ? pr.fork_project_id : pr.project_id - json.fork_project_identifier pr.fork_project_id.present? ? pr&.fork_project&.identifier : pr.project&.identifier - json.fork_project_user pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:login) : pr.project&.owner.try(:login) - json.fork_project_user_name pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:show_real_name) : pr.project&.owner.try(:show_real_name) + json.fork_project_id pr.fork_project_id + json.fork_project_identifier pr.fork_project.present? ? pr&.fork_project&.identifier : pr.fork_project_identifier + json.fork_project_user pr.fork_project.present? ? pr&.fork_project&.owner.try(:login) : pr.fork_project_owner + json.fork_project_user_name pr.fork_project.present? ? pr&.fork_project&.owner.try(:show_real_name) : User.find_by(login: pr.fork_project_owner).try(:show_real_name) json.reviewers pr.reviewers.pluck(:login) json.id issue.id json.name issue.subject json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on) + json.pr_full_time pr.status == 1 ? pr.updated_at : issue.updated_on json.assign_user_name issue.get_assign_user.try(:show_real_name) json.assign_user_login issue.get_assign_user.try(:login) json.author_name issue.user.try(:show_real_name) diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 4c731b9ac..509577edc 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -25,9 +25,10 @@ end json.pull_request do json.extract! @pull_request, :id,:base, :head, :status, :is_original json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open") - json.fork_project_id @pull_request.fork_project_id.present? ? @pull_request.fork_project_id : @pull_request.project_id - json.fork_project_user @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.project&.owner.try(:login) - json.fork_project_user_name @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : @pull_request.project&.owner.try(:show_real_name) + json.fork_project_id @pull_request.fork_project_id + json.fork_project_identifier @pull_request.fork_project.present? ? @pull_request&.fork_project&.identifier : @pull_request.fork_project_identifier + json.fork_project_user @pull_request.fork_project.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.fork_project_owner + json.fork_project_user_name @pull_request.fork_project.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : User.find_by(login: @pull_request.fork_project_owner).try(:show_real_name) json.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"] diff --git a/app/views/repositories/tags.json.jbuilder b/app/views/repositories/tags.json.jbuilder index 5e3c7e39e..0ddcc9cd6 100644 --- a/app/views/repositories/tags.json.jbuilder +++ b/app/views/repositories/tags.json.jbuilder @@ -10,6 +10,7 @@ json.tags @tags do |tag| end json.time_ago time_from_now(tag['tagger']['date'].to_time) json.created_at_unix tag['tagger']['date'].to_time.to_i + json.created_time tag['tagger']['date'].to_time json.message tag['message'] json.commit do json.sha tag['commit']['sha'] diff --git a/app/views/users/organizations/index.json.jbuilder b/app/views/users/organizations/index.json.jbuilder index 0a1950367..3963a3b12 100644 --- a/app/views/users/organizations/index.json.jbuilder +++ b/app/views/users/organizations/index.json.jbuilder @@ -1,4 +1,5 @@ json.total_count @organizations.total_count json.organizations @organizations do |organization| json.partial! "/organizations/organizations/detail", organization: organization + json.is_home_top @home_top_ids.include?(organization.id) end diff --git a/app/views/users/projects.json.jbuilder b/app/views/users/projects.json.jbuilder index d00ec68b0..087b96573 100644 --- a/app/views/users/projects.json.jbuilder +++ b/app/views/users/projects.json.jbuilder @@ -1,4 +1,5 @@ json.count @total_count -json.projects do - json.partial! '/projects/project_detail', collection: @projects, as: :project +json.projects @projects do |project| + json.partial! '/projects/project_detail', project: project + json.is_home_top @home_top_ids.include?(project.id) end diff --git a/config/routes/api.rb b/config/routes/api.rb index 5f4691a24..d4ac74aeb 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -24,6 +24,11 @@ defaults format: :json do scope module: :users do resources :projects, only: [:index] resources :feedbacks, only: [:create] + resources :home_top_settings, only: [:create] do + collection do + delete :cancel + end + end resources :openkylin_sign, only: [:create] do collection do get :competitions @@ -95,7 +100,7 @@ defaults format: :json do collection do post :disable post :enable - resources :runs, only: [:index] do + resources :runs, only: [:index, :create] do post '/jobs/:job', to: 'runs#job_show' post '/rerun', to: 'runs#rerun' post '/jobs/:job/rerun', to: 'runs#job_rerun' diff --git a/db/migrate/20240628023909_add_glcc_admin_field_to_users.rb b/db/migrate/20240628023909_add_glcc_admin_field_to_users.rb new file mode 100644 index 000000000..bef50068a --- /dev/null +++ b/db/migrate/20240628023909_add_glcc_admin_field_to_users.rb @@ -0,0 +1,5 @@ +class AddGlccAdminFieldToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :glcc_admin, :boolean, default: false + end +end diff --git a/db/migrate/20240715072430_create_home_top_settings.rb b/db/migrate/20240715072430_create_home_top_settings.rb new file mode 100644 index 000000000..e3099a201 --- /dev/null +++ b/db/migrate/20240715072430_create_home_top_settings.rb @@ -0,0 +1,10 @@ +class CreateHomeTopSettings < ActiveRecord::Migration[5.2] + def change + create_table :home_top_settings do |t| + t.references :user + t.references :top, polymorphic: true, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb b/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb new file mode 100644 index 000000000..d4d98a559 --- /dev/null +++ b/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb @@ -0,0 +1,6 @@ +class AddForkProjectOwnerIdentifierToPullRequests < ActiveRecord::Migration[5.2] + def change + add_column :pull_requests, :fork_project_owner, :string + add_column :pull_requests, :fork_project_identifier, :string + end +end