| @@ -165,7 +165,7 @@ class IssuesController < ApplicationController | |||||
| end | end | ||||
| def update | def update | ||||
| issue_params = issue_send_params(params).except("issue_classify", "author_id", "project_id") | |||||
| issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id) | |||||
| return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id | return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id | ||||
| if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists? | if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists? | ||||
| @issue&.issue_tags_relates&.destroy_all | @issue&.issue_tags_relates&.destroy_all | ||||
| @@ -26,7 +26,7 @@ class Project < ApplicationRecord | |||||
| has_many :pull_requests, dependent: :destroy | has_many :pull_requests, dependent: :destroy | ||||
| has_many :issue_tags, dependent: :destroy | has_many :issue_tags, dependent: :destroy | ||||
| has_many :issues, dependent: :destroy | has_many :issues, dependent: :destroy | ||||
| has_many :user_grades, dependent: :destroy | |||||
| # has_many :user_grades, dependent: :destroy | |||||
| has_many :attachments, as: :container, dependent: :destroy | has_many :attachments, as: :container, dependent: :destroy | ||||
| has_one :project_score, dependent: :destroy | has_one :project_score, dependent: :destroy | ||||
| has_many :versions, -> { order("versions.effective_date DESC, versions.name DESC") }, dependent: :destroy | has_many :versions, -> { order("versions.effective_date DESC, versions.name DESC") }, dependent: :destroy | ||||
| @@ -1,4 +1,4 @@ | |||||
| class UserGrade < ApplicationRecord | class UserGrade < ApplicationRecord | ||||
| belongs_to :project | |||||
| belongs_to :user | |||||
| # belongs_to :project | |||||
| # belongs_to :user | |||||
| end | end | ||||
| @@ -13,7 +13,7 @@ class Projects::ApplyJoinService < ApplicationService | |||||
| # 项目报告人员直接加入项目 | # 项目报告人员直接加入项目 | ||||
| if params[:role] == 'reporter' | if params[:role] == 'reporter' | ||||
| Projects::JoinService.call(project, user, role: 'reporter') | |||||
| # Projects::JoinService.call(project, user, role: 'reporter') | |||||
| return project | return project | ||||
| end | end | ||||
| @@ -13,7 +13,7 @@ class Projects::JoinService < ApplicationService | |||||
| member.member_roles.create!(role_id: role_value) | member.member_roles.create!(role_id: role_value) | ||||
| project.user_grades.find_or_create_by!(user: user) | |||||
| # project.user_grades.find_or_create_by!(user: user) | |||||
| end | end | ||||
| ApplyJoinProjectNotifyJob.perform_later(user, project, role_value) | ApplyJoinProjectNotifyJob.perform_later(user, project, role_value) | ||||