Browse Source

修改issues的问题

tags/v1
sylor_huang@126.com 6 years ago
parent
commit
259142c59b
5 changed files with 6 additions and 6 deletions
  1. +1
    -1
      app/controllers/issues_controller.rb
  2. +1
    -1
      app/models/project.rb
  3. +2
    -2
      app/models/user_grade.rb
  4. +1
    -1
      app/services/projects/apply_join_service.rb
  5. +1
    -1
      app/services/projects/join_service.rb

+ 1
- 1
app/controllers/issues_controller.rb View File

@@ -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


+ 1
- 1
app/models/project.rb View File

@@ -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


+ 2
- 2
app/models/user_grade.rb View File

@@ -1,4 +1,4 @@
class UserGrade < ApplicationRecord class UserGrade < ApplicationRecord
belongs_to :project
belongs_to :user
# belongs_to :project
# belongs_to :user
end end

+ 1
- 1
app/services/projects/apply_join_service.rb View File

@@ -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




+ 1
- 1
app/services/projects/join_service.rb View File

@@ -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)


Loading…
Cancel
Save