diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 11:39:32 -0800 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 11:39:32 -0800 |
commit | 65e700472b471242475eb9d9e3a340c6ce24615a (patch) | |
tree | 1e859b9989e8f570e4bbe229335bde295c977241 /app/models/project.rb | |
parent | c70dcd290704777104a136bd038dffc68daec4ab (diff) | |
download | gitlab-ce-65e700472b471242475eb9d9e3a340c6ce24615a.tar.gz |
Update the issue tracker attribute on issue tracker change.
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 20b9a5a34dc..de31f14b98e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -308,11 +308,14 @@ class Project < ActiveRecord::Base end def default_issues_tracker? - self.issues_tracker == Project.issues_tracker.default_value - end - - def external_issues_tracker_enabled? - external_issues_trackers.any? + if external_issue_tracker + false + else + unless self.issues_tracker == Project.issues_tracker.default_value + self.update_attributes(issues_tracker: Project.issues_tracker.default_value) + end + true + end end def external_issues_trackers @@ -323,10 +326,6 @@ class Project < ActiveRecord::Base @external_issues_tracker ||= external_issues_trackers.select(&:activated?).first end - def using_issue_tracker? - default_issues_tracker? || !external_issues_tracker_enabled? - end - def can_have_issues_tracker_id? self.issues_enabled && !self.default_issues_tracker? end |