Download as
Browse Code »

Commit ef295d438d293b9888760b947e89d0761d7270c8

Authored by Doug Stewart
1 parent e69e1c92
Exists in master and in 1 other branch production

Bring label text similar to that of the Campfire service ('subdomain' rather than 'account')

Showing 3 changed files with 16 additions and 14 deletions   Show diff stats
app/models/issue_trackers/lighthouse_tracker.rb
  Diff comments   View file @ef295d4
@@ -3,8 +3,8 @@ if defined? Lighthouse @@ -3,8 +3,8 @@ if defined? Lighthouse
3 Label = "lighthouseapp" 3 Label = "lighthouseapp"
4 Fields = [ 4 Fields = [
5 [:account, { 5 [:account, {
6 - :label => "Account (subdomain)",  
7 - :placeholder => "example if http://example.lighthouseapp.com" 6 + :label => "Lighthouse Subdomain",
  7 + :placeholder => "example"
8 }], 8 }],
9 [:api_token, { 9 [:api_token, {
10 :label => "API Token", 10 :label => "API Token",
@@ -18,7 +18,7 @@ if defined? Lighthouse @@ -18,7 +18,7 @@ if defined? Lighthouse
18 18
19 def check_params 19 def check_params
20 if Fields.detect {|f| self[f[0]].blank? } 20 if Fields.detect {|f| self[f[0]].blank? }
21 - 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'
22 end 22 end
23 end 23 end
24 24
app/models/issue_trackers/redmine_tracker.rb
  Diff comments   View file @ef295d4
@@ -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 @ef295d4
@@ -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