From fce5547da0a685295b0ea0d563c16dc93da2a8d5 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Wed, 30 May 2012 16:36:33 +1200 Subject: [PATCH] Pass current_user to issue tracker's #create_issue method, for setting 'reported_by' fields --- app/controllers/errs_controller.rb | 2 +- app/models/issue_trackers/fogbugz_tracker.rb | 2 +- app/models/issue_trackers/github_issues_tracker.rb | 6 +++--- app/models/issue_trackers/lighthouse_tracker.rb | 2 +- app/models/issue_trackers/mingle_tracker.rb | 2 +- app/models/issue_trackers/pivotal_labs_tracker.rb | 2 +- app/models/issue_trackers/redmine_tracker.rb | 2 +- app/views/issue_trackers/github_issues_body.txt.erb | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/errs_controller.rb b/app/controllers/errs_controller.rb index 9680ff3..f81fee8 100644 --- a/app/controllers/errs_controller.rb +++ b/app/controllers/errs_controller.rb @@ -39,7 +39,7 @@ class ErrsController < ApplicationController set_tracker_params if @app.issue_tracker - @app.issue_tracker.create_issue @problem + @app.issue_tracker.create_issue @problem, current_user else flash[:error] = "This app has no issue tracker setup." end diff --git a/app/models/issue_trackers/fogbugz_tracker.rb b/app/models/issue_trackers/fogbugz_tracker.rb index 94b0c38..89d4797 100644 --- a/app/models/issue_trackers/fogbugz_tracker.rb +++ b/app/models/issue_trackers/fogbugz_tracker.rb @@ -22,7 +22,7 @@ class IssueTrackers::FogbugzTracker < IssueTracker end end - def create_issue(problem) + def create_issue(problem, reported_by) fogbugz = Fogbugz::Interface.new(:email => username, :password => password, :uri => "https://#{account}.fogbugz.com") fogbugz.authenticate diff --git a/app/models/issue_trackers/github_issues_tracker.rb b/app/models/issue_trackers/github_issues_tracker.rb index 178a19c..7a04211 100644 --- a/app/models/issue_trackers/github_issues_tracker.rb +++ b/app/models/issue_trackers/github_issues_tracker.rb @@ -19,10 +19,10 @@ class IssueTrackers::GithubIssuesTracker < IssueTracker end end - def create_issue(err) + def create_issue(problem, reported_by) client = Octokit::Client.new(:login => username, :token => api_token) - issue = client.create_issue(project_id, issue_title(err), body_template.result(binding).unpack('C*').pack('U*'), options = {}) - err.update_attribute :issue_link, issue.html_url + issue = client.create_issue(project_id, issue_title(problem), body_template.result(binding).unpack('C*').pack('U*'), options = {}) + problem.update_attribute :issue_link, issue.html_url end def body_template diff --git a/app/models/issue_trackers/lighthouse_tracker.rb b/app/models/issue_trackers/lighthouse_tracker.rb index b7edc99..c871046 100644 --- a/app/models/issue_trackers/lighthouse_tracker.rb +++ b/app/models/issue_trackers/lighthouse_tracker.rb @@ -18,7 +18,7 @@ class IssueTrackers::LighthouseTracker < IssueTracker end end - def create_issue(problem) + def create_issue(problem, reported_by) Lighthouse.account = account Lighthouse.token = api_token # updating lighthouse account diff --git a/app/models/issue_trackers/mingle_tracker.rb b/app/models/issue_trackers/mingle_tracker.rb index 419ad37..f5d15d3 100644 --- a/app/models/issue_trackers/mingle_tracker.rb +++ b/app/models/issue_trackers/mingle_tracker.rb @@ -27,7 +27,7 @@ class IssueTrackers::MingleTracker < IssueTracker end end - def create_issue(problem) + def create_issue(problem, reported_by) properties = ticket_properties_hash basic_auth = account.gsub(/https?:\/\//, "https://#{username}:#{password}@") Mingle.set_site "#{basic_auth}/api/v1/projects/#{project_id}/" diff --git a/app/models/issue_trackers/pivotal_labs_tracker.rb b/app/models/issue_trackers/pivotal_labs_tracker.rb index c7ab6d6..d63b7b2 100644 --- a/app/models/issue_trackers/pivotal_labs_tracker.rb +++ b/app/models/issue_trackers/pivotal_labs_tracker.rb @@ -13,7 +13,7 @@ class IssueTrackers::PivotalLabsTracker < IssueTracker end end - def create_issue(problem) + def create_issue(problem, reported_by) PivotalTracker::Client.token = api_token PivotalTracker::Client.use_ssl = true project = PivotalTracker::Project.find project_id.to_i diff --git a/app/models/issue_trackers/redmine_tracker.rb b/app/models/issue_trackers/redmine_tracker.rb index 76aee4e..14e6e04 100644 --- a/app/models/issue_trackers/redmine_tracker.rb +++ b/app/models/issue_trackers/redmine_tracker.rb @@ -25,7 +25,7 @@ class IssueTrackers::RedmineTracker < IssueTracker end end - def create_issue(problem) + def create_issue(problem, reported_by) token = api_token acc = account RedmineClient::Base.configure do diff --git a/app/views/issue_trackers/github_issues_body.txt.erb b/app/views/issue_trackers/github_issues_body.txt.erb index 0d52990..7ac9514 100644 --- a/app/views/issue_trackers/github_issues_body.txt.erb +++ b/app/views/issue_trackers/github_issues_body.txt.erb @@ -1,5 +1,5 @@ -[See this exception on Errbit](<%= app_err_url err.app, err %> "See this exception on Errbit") -<% if notice = err.notices.first %> +[See this exception on Errbit](<%= app_err_url problem.app, problem %> "See this exception on Errbit") +<% if notice = problem.notices.first %> # <%= notice.message %> # ## Summary ## <% if notice.request['url'].present? %> -- libgit2 0.21.2