Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
This commit is contained in:
commit
a37b8ab2b2
|
@ -80,6 +80,18 @@ module ProjectsHelper
|
||||||
@project.milestones.active.order("id desc").all
|
@project.milestones.active.order("id desc").all
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def project_issues_trackers
|
||||||
|
values = Project.issues_tracker.values.map do |tracker_key|
|
||||||
|
if tracker_key.to_sym == :gitlab
|
||||||
|
['GitLab', tracker_key]
|
||||||
|
else
|
||||||
|
[Gitlab.config.issues_tracker[tracker_key]['title'] || tracker_key, tracker_key]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
options_for_select(values)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def get_project_nav_tabs(project, current_user)
|
def get_project_nav_tabs(project, current_user)
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
- if Project.issues_tracker.values.count > 1
|
- if Project.issues_tracker.values.count > 1
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :issues_tracker, "Issues tracker", class: 'control-label'
|
= f.label :issues_tracker, "Issues tracker", class: 'control-label'
|
||||||
.controls= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
|
.controls= f.select(:issues_tracker, project_issues_trackers, {}, { disabled: !@project.issues_enabled })
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
|
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
|
||||||
|
|
|
@ -73,6 +73,7 @@ production: &base
|
||||||
## External issues trackers
|
## External issues trackers
|
||||||
issues_tracker:
|
issues_tracker:
|
||||||
# redmine:
|
# redmine:
|
||||||
|
# title: "Redmine"
|
||||||
# ## If not nil, link 'Issues' on project page will be replaced with this
|
# ## If not nil, link 'Issues' on project page will be replaced with this
|
||||||
# ## Use placeholders:
|
# ## Use placeholders:
|
||||||
# ## :project_id - GitLab project identifier
|
# ## :project_id - GitLab project identifier
|
||||||
|
@ -93,6 +94,7 @@ production: &base
|
||||||
# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
|
# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
|
||||||
#
|
#
|
||||||
# jira:
|
# jira:
|
||||||
|
# title: "Atlassian Jira"
|
||||||
# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
|
# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
|
||||||
# issues_url: "http://jira.sample/browse/:id"
|
# issues_url: "http://jira.sample/browse/:id"
|
||||||
# new_issue_url: "http://jira.sample/secure/CreateIssue.jspa"
|
# new_issue_url: "http://jira.sample/secure/CreateIssue.jspa"
|
||||||
|
@ -206,6 +208,7 @@ test:
|
||||||
<<: *base
|
<<: *base
|
||||||
issues_tracker:
|
issues_tracker:
|
||||||
redmine:
|
redmine:
|
||||||
|
title: "Redmine"
|
||||||
project_url: "http://redmine/projects/:issues_tracker_id"
|
project_url: "http://redmine/projects/:issues_tracker_id"
|
||||||
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
|
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
|
||||||
new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
|
new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe ProjectsHelper do
|
||||||
|
describe '#project_issues_trackers' do
|
||||||
|
it "returns the correct issues trackers available" do
|
||||||
|
project_issues_trackers.should ==
|
||||||
|
"<option value=\"redmine\">Redmine</option>\n" \
|
||||||
|
"<option value=\"gitlab\">GitLab</option>"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue