deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Project issue tracker functions refactored

Browse source
This commit is contained in:
Andrew8xx8 2013-02-11 15:41:12 +04:00
parent 999fc2391b
commit 68a7ecdaaf
6 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/helpers/issues_helper.rb
View file

@ -42,7 +42,7 @@ module IssuesHelper
end
def url_for_issue(issue_id)
if @project.issues_tracker == Project.issues_tracker.default_value
if @project.used_default_issues_tracker?
url = project_issue_url project_id: @project, id: issue_id
else
url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"]
@ -51,20 +51,10 @@ module IssuesHelper
end
def title_for_issue(issue_id)
if issue = @project.issues.where(id: issue_id).first
if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first
issue.title
else
""
end
end
def issue_exists?(issue_id)
return false if @project.nil?
if @project.issues_tracker == Project.issues_tracker.default_value
@project.issues.where(id: issue_id).first.present?
else
true
end
end
end

12
app/models/project.rb
View file

@ -205,6 +205,18 @@ class Project < ActiveRecord::Base
issues.tag_counts_on(:labels)
end
def issue_exists?(issue_id)
if used_default_issues_tracker?
self.issues.where(id: issue_id).first.present?
else
true
end
end
def used_default_issues_tracker?
self.issues_tracker == Project.issues_tracker.default_value
end
def services
[gitlab_ci_service].compact
end