Browse Source

fixed 删除用户时issue,pr用户显示已注销

pull/347/head
xxq250 1 year ago
parent
commit
71bdde79ef
4 changed files with 9 additions and 7 deletions
  1. +1
    -1
      app/views/api/v1/users/_simple_user.json.jbuilder
  2. +2
    -2
      app/views/pull_requests/index.json.jbuilder
  3. +2
    -2
      app/views/pull_requests/show.json.jbuilder
  4. +4
    -2
      app/views/users/_user_simple.json.jbuilder

+ 1
- 1
app/views/api/v1/users/_simple_user.json.jbuilder View File

@@ -7,5 +7,5 @@ if user.present?
else
json.name "已注销"
json.login ""
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + User::Avatar.get_letter_avatar_url("D")
end

+ 2
- 2
app/views/pull_requests/index.json.jbuilder View File

@@ -35,9 +35,9 @@ json.issues do
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)
json.author_name issue.user.blank?? "已注销": issue.user.show_real_name
json.author_login issue.user.try(:login)
json.avatar_url url_to_avatar(issue.user)
json.avatar_url issue.user.blank?? User::Avatar.get_letter_avatar_url("D") : url_to_avatar(issue.user)
json.priority issue.priority.try(:name)
json.version issue.version.try(:name)
json.journals_count issue.get_journals_size


+ 2
- 2
app/views/pull_requests/show.json.jbuilder View File

@@ -44,9 +44,9 @@ json.issue do
json.created_at format_time(@issue.created_on)
json.assign_user_name @issue_assign_to.try(:show_real_name)
json.assign_user_login @issue_assign_to.try(:login)
json.author_name @issue_user.try(:show_real_name)
json.author_name @issue_user.blank?? "已注销": @issue_user.show_real_name
json.author_login @issue_user.try(:login)
json.author_picture url_to_avatar(@issue_user)
json.avatar_url @issue_user.blank?? User::Avatar.get_letter_avatar_url("D") : url_to_avatar(@issue_user)
json.issue_status @issue.issue_status.try(:name)
json.priority @issue.priority.try(:name)
json.version @issue.version.try(:name)


+ 4
- 2
app/views/users/_user_simple.json.jbuilder View File

@@ -4,6 +4,8 @@ if user.present?
json.name user.real_name
json.login user.login
json.image_url url_to_avatar(user)
else
json.nil!
else
json.name "已注销"
json.login ""
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + User::Avatar.get_letter_avatar_url("D")
end

Loading…
Cancel
Save