diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f2ec84df1..42f2d9d96 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -328,8 +328,8 @@ class ApplicationController < ActionController::Base def current_user # User.current - User.find_by_id 130328 - # User.find_by_id 36390 + # User.find_by_id 130328 + User.find_by_id 36390 # nil end diff --git a/app/helpers/tag_chosen_helper.rb b/app/helpers/tag_chosen_helper.rb index 25e07b046..3a0b2f4ca 100644 --- a/app/helpers/tag_chosen_helper.rb +++ b/app/helpers/tag_chosen_helper.rb @@ -37,7 +37,7 @@ module TagChosenHelper project_members.each do |member| user = member.user real_name = user.try(:show_real_name) - user_id = member[0] + user_id = user.id is_chosen = ((user.id.to_s == issue_info[0].to_s) ? "1" : "0") member_info = {id: user_id, name: real_name,avatar_url: url_to_avatar(user),is_chosen: is_chosen} project_members_info.push(member_info) diff --git a/app/views/issues/index.json.jbuilder b/app/views/issues/index.json.jbuilder index 70f6923ac..8c6b04199 100644 --- a/app/views/issues/index.json.jbuilder +++ b/app/views/issues/index.json.jbuilder @@ -21,7 +21,7 @@ json.issues do json.author_login issue.user.try(:login) json.tracker issue.tracker.try(:name) json.issue_status issue.issue_status.try(:name) - json.priority issue.priority.try(:title) + json.priority issue.priority.try(:name) json.version issue.version.try(:title) json.done_ratio issue.done_ratio.to_s + "%" json.journals_count issue.get_journals_size diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index c3338e1a6..ee4639d0c 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -23,7 +23,7 @@ json.issues do json.author_login issue.user.try(:login) json.tracker issue.tracker.try(:name) json.issue_status issue.issue_status.try(:name) - json.priority issue.priority.try(:title) + json.priority issue.priority.try(:name) json.version issue.version.try(:title) json.done_ratio issue.done_ratio.to_s + "%" json.journals_count issue.get_journals_size