fixed 删除用户图标
This commit is contained in:
		
							parent
							
								
									c8e9c705f3
								
							
						
					
					
						commit
						098b045315
					
				| 
						 | 
				
			
			@ -8,5 +8,5 @@ else
 | 
			
		|||
  json.name "已注销"
 | 
			
		||||
  json.login user&.login
 | 
			
		||||
  json.type "User"
 | 
			
		||||
  json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + "/images/account/del.svg"
 | 
			
		||||
  json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + "images/account/del.svg"
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
json.id journal.id
 | 
			
		||||
json.user_name journal.user.blank?? "已注销": journal.user.show_real_name
 | 
			
		||||
json.user_login journal.user&.login
 | 
			
		||||
json.user_picture journal.user.blank?? "/images/account/del.svg" : url_to_avatar(journal.user)
 | 
			
		||||
json.user_picture journal.user.blank?? "images/account/del.svg" : url_to_avatar(journal.user)
 | 
			
		||||
json.is_journal_detail journal.is_journal_detail?  #判断是否修改了参数而添加的回复内容
 | 
			
		||||
json.content journal.try(:notes)
 | 
			
		||||
json.journal_details journal.journal_content
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@ json.action_type l("trend.#{trend.action_type}") + l("trend.#{trend.trend_type}"
 | 
			
		|||
json.trend_id trend.trend_id
 | 
			
		||||
json.user_name trend.user.blank?? "已注销": trend.user.show_real_name
 | 
			
		||||
json.user_login trend.user&.login
 | 
			
		||||
json.user_avatar trend.user.blank?? "/images/account/del.svg" : url_to_avatar(trend.user)
 | 
			
		||||
json.user_avatar trend.user.blank?? "images/account/del.svg" : url_to_avatar(trend.user)
 | 
			
		||||
json.action_time time_from_now(trend.created_at)
 | 
			
		||||
json.project do 
 | 
			
		||||
  json.owner do 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -37,7 +37,7 @@ json.issues do
 | 
			
		|||
    json.assign_user_login issue.get_assign_user.try(:login)
 | 
			
		||||
    json.author_name issue.user.blank?? "已注销": issue.user.show_real_name
 | 
			
		||||
    json.author_login issue.user.try(:login)
 | 
			
		||||
    json.avatar_url issue.user.blank?? "/images/account/del.svg" : url_to_avatar(issue.user)
 | 
			
		||||
    json.avatar_url issue.user.blank?? "images/account/del.svg" : url_to_avatar(issue.user)
 | 
			
		||||
    json.priority issue.priority.try(:name)
 | 
			
		||||
    json.version issue.version.try(:name)
 | 
			
		||||
    json.journals_count issue.get_journals_size
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,7 +46,7 @@ json.issue do
 | 
			
		|||
  json.assign_user_login @issue_assign_to.try(:login)
 | 
			
		||||
  json.author_name @issue_user.blank?? "已注销": @issue_user.show_real_name
 | 
			
		||||
  json.author_login @issue_user.try(:login)
 | 
			
		||||
  json.author_picture @issue_user.blank?? "/images/account/del.svg" : url_to_avatar(@issue_user)
 | 
			
		||||
  json.author_picture @issue_user.blank?? "images/account/del.svg" : 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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,5 +8,5 @@ else
 | 
			
		|||
  json.name "已注销"
 | 
			
		||||
  json.login user&.login
 | 
			
		||||
  json.type "User"
 | 
			
		||||
  json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + "/images/account/del.svg"
 | 
			
		||||
  json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + "images/account/del.svg"
 | 
			
		||||
end
 | 
			
		||||
		Loading…
	
		Reference in New Issue