Download as
Browse Code »

Commit d22bf8d2430e85e49e348257a9c552789947d8d2

Authored by Nathan Broadbent
2 parents cf3583d4 ef295d43
Exists in master and in 1 other branch production

Merge pull request #290 from theDoug/tracker-labelling 

Tracker labelling
Showing 3 changed files with 20 additions and 15 deletions   Show diff stats
app/models/issue_trackers/lighthouse_tracker.rb
  Diff comments   View file @d22bf8d
@@ -3,19 +3,22 @@ if defined? Lighthouse @@ -3,19 +3,22 @@ if defined? Lighthouse
3 Label = "lighthouseapp" 3 Label = "lighthouseapp"
4 Fields = [ 4 Fields = [
5 [:account, { 5 [:account, {
6 - :placeholder => "abc from http://abc.lighthouseapp.com" 6 + :label => "Lighthouse Subdomain",
  7 + :placeholder => "example"
7 }], 8 }],
8 [:api_token, { 9 [:api_token, {
9 - :placeholder => "API Token for your account" 10 + :label => "API Token",
  11 + :placeholder => "1aa1111a111111aaaa11a11a1111a11a11111a11"
10 }], 12 }],
11 [:project_id, { 13 [:project_id, {
12 - :placeholder => "Lighthouse project" 14 + :label => "Project ID number",
  15 + :placeholder => "123456"
13 }] 16 }]
14 ] 17 ]
15 18
16 def check_params 19 def check_params
17 if Fields.detect {|f| self[f[0]].blank? } 20 if Fields.detect {|f| self[f[0]].blank? }
18 - errors.add :base, 'You must specify your Lighthouseapp account, API token and Project ID' 21 + errors.add :base, 'You must specify your Lighthouseapp Subdomain, API token and Project ID'
19 end 22 end
20 end 23 end
21 24
app/models/issue_trackers/redmine_tracker.rb
  Diff comments   View file @d22bf8d
@@ -4,7 +4,7 @@ if defined? RedmineClient @@ -4,7 +4,7 @@ if defined? RedmineClient
4 Fields = [ 4 Fields = [
5 [:account, { 5 [:account, {
6 :label => "Redmine URL", 6 :label => "Redmine URL",
7 - :placeholder => "e.g. http://www.redmine.org/" 7 + :placeholder => "http://www.redmine.org/"
8 }], 8 }],
9 [:api_token, { 9 [:api_token, {
10 :placeholder => "API Token for your account" 10 :placeholder => "API Token for your account"
app/models/notification_services/campfire_service.rb
  Diff comments   View file @d22bf8d
@@ -2,16 +2,18 @@ if defined? Campy @@ -2,16 +2,18 @@ if defined? Campy
2 class NotificationServices::CampfireService < NotificationService 2 class NotificationServices::CampfireService < NotificationService
3 Label = "campfire" 3 Label = "campfire"
4 Fields = [ 4 Fields = [
5 - [:subdomain, {  
6 - :placeholder => "Campfire Subdomain"  
7 - }],  
8 - [:api_token, {  
9 - :placeholder => "API Token"  
10 - }],  
11 - [:room_id, {  
12 - :placeholder => "Room ID",  
13 - :label => "Room ID"  
14 - }], 5 + [:subdomain, {
  6 + :label => "Campfire Subdomain",
  7 + :placeholder => "example"
  8 + }],
  9 + [:api_token, {
  10 + :label => "API Token",
  11 + :placeholder => "1aa1111a111111aaaa11a11a1111a11a11111a11"
  12 + }],
  13 + [:room_id, {
  14 + :label => "Room ID number",
  15 + :placeholder => "123456"
  16 + }]
15 ] 17 ]
16 18
17 def check_params 19 def check_params