Commit ff046c72004f0c00827d615a60f37153f54a6347
1 parent
e9142c6f
Exists in
master
and in
4 other branches
Fallback to internal issue tracker if config is invalid.
Showing
2 changed files
with
41 additions
and
3 deletions
Show diff stats
app/helpers/issues_helper.rb
| @@ -16,7 +16,7 @@ module IssuesHelper | @@ -16,7 +16,7 @@ module IssuesHelper | ||
| 16 | def url_for_project_issues | 16 | def url_for_project_issues |
| 17 | return "" if @project.nil? | 17 | return "" if @project.nil? |
| 18 | 18 | ||
| 19 | - if @project.used_default_issues_tracker? | 19 | + if @project.used_default_issues_tracker? || config_disabled? |
| 20 | project_issues_path(@project) | 20 | project_issues_path(@project) |
| 21 | else | 21 | else |
| 22 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] | 22 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] |
| @@ -28,7 +28,7 @@ module IssuesHelper | @@ -28,7 +28,7 @@ module IssuesHelper | ||
| 28 | def url_for_new_issue | 28 | def url_for_new_issue |
| 29 | return "" if @project.nil? | 29 | return "" if @project.nil? |
| 30 | 30 | ||
| 31 | - if @project.used_default_issues_tracker? | 31 | + if @project.used_default_issues_tracker? || config_disabled? |
| 32 | url = new_project_issue_path project_id: @project | 32 | url = new_project_issue_path project_id: @project |
| 33 | else | 33 | else |
| 34 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] | 34 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] |
| @@ -40,7 +40,7 @@ module IssuesHelper | @@ -40,7 +40,7 @@ module IssuesHelper | ||
| 40 | def url_for_issue(issue_iid) | 40 | def url_for_issue(issue_iid) |
| 41 | return "" if @project.nil? | 41 | return "" if @project.nil? |
| 42 | 42 | ||
| 43 | - if @project.used_default_issues_tracker? | 43 | + if @project.used_default_issues_tracker? || config_disabled? |
| 44 | url = project_issue_url project_id: @project, id: issue_iid | 44 | url = project_issue_url project_id: @project, id: issue_iid |
| 45 | else | 45 | else |
| 46 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] | 46 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] |
| @@ -59,4 +59,9 @@ module IssuesHelper | @@ -59,4 +59,9 @@ module IssuesHelper | ||
| 59 | "" | 59 | "" |
| 60 | end | 60 | end |
| 61 | end | 61 | end |
| 62 | + | ||
| 63 | + def config_disabled? | ||
| 64 | + return false if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any? | ||
| 65 | + true | ||
| 66 | + end | ||
| 62 | end | 67 | end |
spec/helpers/issues_helper_spec.rb
| @@ -47,6 +47,17 @@ describe IssuesHelper do | @@ -47,6 +47,17 @@ describe IssuesHelper do | ||
| 47 | 47 | ||
| 48 | url_for_project_issues.should eq "" | 48 | url_for_project_issues.should eq "" |
| 49 | end | 49 | end |
| 50 | + | ||
| 51 | + describe "when external tracker was enabled and then config removed" do | ||
| 52 | + before do | ||
| 53 | + @project = ext_project | ||
| 54 | + Gitlab.config.stub(:issues_tracker).and_return(nil) | ||
| 55 | + end | ||
| 56 | + | ||
| 57 | + it "should return path to internal tracker" do | ||
| 58 | + url_for_project_issues.should match(polymorphic_path([@project])) | ||
| 59 | + end | ||
| 60 | + end | ||
| 50 | end | 61 | end |
| 51 | 62 | ||
| 52 | describe :url_for_issue do | 63 | describe :url_for_issue do |
| @@ -75,6 +86,17 @@ describe IssuesHelper do | @@ -75,6 +86,17 @@ describe IssuesHelper do | ||
| 75 | 86 | ||
| 76 | url_for_issue(issue.iid).should eq "" | 87 | url_for_issue(issue.iid).should eq "" |
| 77 | end | 88 | end |
| 89 | + | ||
| 90 | + describe "when external tracker was enabled and then config removed" do | ||
| 91 | + before do | ||
| 92 | + @project = ext_project | ||
| 93 | + Gitlab.config.stub(:issues_tracker).and_return(nil) | ||
| 94 | + end | ||
| 95 | + | ||
| 96 | + it "should return internal path" do | ||
| 97 | + url_for_issue(issue.iid).should match(polymorphic_path([@project, issue])) | ||
| 98 | + end | ||
| 99 | + end | ||
| 78 | end | 100 | end |
| 79 | 101 | ||
| 80 | describe :url_for_new_issue do | 102 | describe :url_for_new_issue do |
| @@ -101,6 +123,17 @@ describe IssuesHelper do | @@ -101,6 +123,17 @@ describe IssuesHelper do | ||
| 101 | 123 | ||
| 102 | url_for_new_issue.should eq "" | 124 | url_for_new_issue.should eq "" |
| 103 | end | 125 | end |
| 126 | + | ||
| 127 | + describe "when external tracker was enabled and then config removed" do | ||
| 128 | + before do | ||
| 129 | + @project = ext_project | ||
| 130 | + Gitlab.config.stub(:issues_tracker).and_return(nil) | ||
| 131 | + end | ||
| 132 | + | ||
| 133 | + it "should return internal path" do | ||
| 134 | + url_for_new_issue.should match(new_project_issue_path(@project)) | ||
| 135 | + end | ||
| 136 | + end | ||
| 104 | end | 137 | end |
| 105 | 138 | ||
| 106 | end | 139 | end |