kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make clearer use of the check.

Browse source
This commit is contained in:
Marin Jankovski 2013-10-17 11:36:23 +02:00
parent 78e591c737
commit 52739518bc
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/issues_helper.rb
View file

@ -16,7 +16,7 @@ module IssuesHelper
def url_for_project_issues def url_for_project_issues
return "" if @project.nil? return "" if @project.nil?
if @project.used_default_issues_tracker? || config_issues_tracker? if @project.used_default_issues_tracker? || !external_issues_tracker_enabled?
project_issues_path(@project) project_issues_path(@project)
else else
url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"]
@ -28,7 +28,7 @@ module IssuesHelper
def url_for_new_issue def url_for_new_issue
return "" if @project.nil? return "" if @project.nil?
if @project.used_default_issues_tracker? || config_issues_tracker? if @project.used_default_issues_tracker? || !external_issues_tracker_enabled?
url = new_project_issue_path project_id: @project url = new_project_issue_path project_id: @project
else else
url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"]
@ -40,7 +40,7 @@ module IssuesHelper
def url_for_issue(issue_iid) def url_for_issue(issue_iid)
return "" if @project.nil? return "" if @project.nil?
if @project.used_default_issues_tracker? || config_issues_tracker? if @project.used_default_issues_tracker? || !external_issues_tracker_enabled?
url = project_issue_url project_id: @project, id: issue_iid url = project_issue_url project_id: @project, id: issue_iid
else else
url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"]
@ -60,8 +60,12 @@ module IssuesHelper
end end
end end
def config_issues_tracker? # Checks if issues_tracker setting exists in gitlab.yml
return false if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any? def external_issues_tracker_enabled?
true if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any?
true
else
false
end
end end
end end