From 44e49755adf9b7aeaa7d2068d9684244c31e8cf9 Mon Sep 17 00:00:00 2001 From: Sergey Nartimov Date: Mon, 29 Oct 2012 23:42:38 +0300 Subject: [PATCH] extract IssueTracker#configured? and NotificationService#configured? --- app/models/app.rb | 4 ++-- app/models/issue_tracker.rb | 4 ++++ app/models/notification_service.rb | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/app.rb b/app/models/app.rb index 7f05e59..9a09f76 100644 --- a/app/models/app.rb +++ b/app/models/app.rb @@ -142,11 +142,11 @@ class App def issue_tracker_configured? - !!(issue_tracker && issue_tracker.class < IssueTracker && issue_tracker.project_id.present?) + !!(issue_tracker && issue_tracker.class < IssueTracker && issue_tracker.configured?) end def notification_service_configured? - !!(notification_service && notification_service.class < NotificationService && notification_service.api_token.present?) + !!(notification_service && notification_service.class < NotificationService && notification_service.configured?) end diff --git a/app/models/issue_tracker.rb b/app/models/issue_tracker.rb index 6c35057..f37f02d 100644 --- a/app/models/issue_tracker.rb +++ b/app/models/issue_tracker.rb @@ -35,5 +35,9 @@ class IssueTracker Label = '' def self.label; self::Label; end def label; self.class.label; end + + def configured? + project_id.present? + end end diff --git a/app/models/notification_service.rb b/app/models/notification_service.rb index fb83546..4dd08ba 100644 --- a/app/models/notification_service.rb +++ b/app/models/notification_service.rb @@ -30,4 +30,8 @@ class NotificationService Label = '' def self.label; self::Label; end def label; self.class.label; end + + def configured? + api_token.present? + end end -- libgit2 0.21.2