Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
fb6e8ed3302c
Commit
fb6e8ed3
authored
Jan 23, 2015
by
Marin Jankovski
Browse files
Do a check which issue tracker is used inside the project.
parent
b7a721d4ed0c
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/helpers/issues_helper.rb
View file @
fb6e8ed3
...
...
@@ -16,7 +16,7 @@
def
url_for_project_issues
(
project
=
@project
)
return
''
if
project
.
nil?
if
project
.
us
ed_default_issues_tracker?
||
!
project
.
external
_issue
s
_tracker
_enabled
?
if
project
.
us
ing
_issue_tracker?
project_issues_path
(
project
)
else
url
=
Gitlab
.
config
.
issues_tracker
[
project
.
issues_tracker
][
'project_url'
]
...
...
@@ -28,7 +28,7 @@
def
url_for_new_issue
(
project
=
@project
)
return
''
if
project
.
nil?
if
project
.
us
ed_default_issues_tracker?
||
!
project
.
external
_issue
s
_tracker
_enabled
?
if
project
.
us
ing
_issue_tracker?
url
=
new_project_issue_path
project_id:
project
else
issues_tracker
=
Gitlab
.
config
.
issues_tracker
[
project
.
issues_tracker
]
...
...
@@ -41,7 +41,7 @@
def
url_for_issue
(
issue_iid
,
project
=
@project
)
return
''
if
project
.
nil?
if
project
.
us
ed_default_issues_tracker?
||
!
project
.
external
_issue
s
_tracker
_enabled
?
if
project
.
us
ing
_issue_tracker?
url
=
project_issue_url
project_id:
project
,
id:
issue_iid
else
url
=
Gitlab
.
config
.
issues_tracker
[
project
.
issues_tracker
][
'issues_url'
]
...
...
@@ -54,7 +54,7 @@
def
title_for_issue
(
issue_iid
,
project
=
@project
)
return
''
if
project
.
nil?
if
project
.
used_
default_issues_tracker?
if
project
.
default_issues_tracker?
issue
=
project
.
issues
.
where
(
iid:
issue_iid
).
first
return
issue
.
title
if
issue
end
...
...
app/models/project.rb
View file @
fb6e8ed3
...
...
@@ -298,10 +298,10 @@
end
def
issue_exists?
(
issue_id
)
if
used_
default_issues_tracker?
if
default_issues_tracker?
self
.
issues
.
where
(
iid:
issue_id
).
first
.
present?
else
true
end
end
...
...
@@ -302,10 +302,10 @@
self
.
issues
.
where
(
iid:
issue_id
).
first
.
present?
else
true
end
end
def
used_
default_issues_tracker?
def
default_issues_tracker?
self
.
issues_tracker
==
Project
.
issues_tracker
.
default_value
end
...
...
@@ -321,4 +321,8 @@
@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?
...
...
@@ -324,5 +328,5 @@
def
can_have_issues_tracker_id?
self
.
issues_enabled
&&
!
self
.
used_
default_issues_tracker?
self
.
issues_enabled
&&
!
self
.
default_issues_tracker?
end
def
build_missing_services
...
...
app/views/layouts/nav/_project.html.haml
View file @
fb6e8ed3
...
...
@@ -39,7 +39,7 @@
%i
.fa.fa-exclamation-circle
%span
Issues
-
if
@project
.
used_
default_issues_tracker?
-
if
@project
.
default_issues_tracker?
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
-
if
project_nav_tab?
:merge_requests
...
...
lib/gitlab/markdown.rb
View file @
fb6e8ed3
...
...
@@ -208,7 +208,7 @@
end
def
reference_issue
(
identifier
,
project
=
@project
,
prefix_text
=
nil
)
if
project
.
us
ed_default_issues_tracker?
||
!
project
.
external
_issue
s
_tracker
_enabled
?
if
project
.
us
ing
_issue_tracker?
if
project
.
issue_exists?
identifier
url
=
url_for_issue
(
identifier
,
project
)
title
=
title_for_issue
(
identifier
,
project
)
...
...
spec/models/project_spec.rb
View file @
fb6e8ed3
...
...
@@ -195,8 +195,8 @@
end
end
describe
:
used_
default_issues_tracker?
do
describe
:default_issues_tracker?
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:ext_project
)
{
create
(
:redmine_project
)
}
it
"should be true if used internal tracker"
do
...
...
@@ -199,8 +199,8 @@
let
(
:project
)
{
create
(
:project
)
}
let
(
:ext_project
)
{
create
(
:redmine_project
)
}
it
"should be true if used internal tracker"
do
project
.
used_
default_issues_tracker?
.
should
be_true
project
.
default_issues_tracker?
.
should
be_true
end
it
"should be false if used other tracker"
do
...
...
@@ -204,7 +204,7 @@
end
it
"should be false if used other tracker"
do
ext_project
.
used_
default_issues_tracker?
.
should
be_false
ext_project
.
default_issues_tracker?
.
should
be_false
end
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment