Download as
Browse Code »

Commit cff845784eb76aeaff7b4242e0aaa2469a530a59

Authored by Andrew8xx8
1 parent 8caccae4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Show Issues tracker select only if one or more remote issue trackers available

Showing 2 changed files with 14 additions and 12 deletions   Show diff stats
app/views/admin/projects/_form.html.haml
  Diff comments   View file @cff8457
@@ -31,13 +31,14 @@ @@ -31,13 +31,14 @@
31 = f.label :issues_enabled, "Issues" 31 = f.label :issues_enabled, "Issues"
32 .input= f.check_box :issues_enabled 32 .input= f.check_box :issues_enabled
33 33
34 - .clearfix  
35 - = f.label :issues_tracker, "Issues tracker", class: 'control-label'  
36 - .input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled }) 34 + - if Project.issues_tracker.values.count > 1
  35 + .clearfix
  36 + = f.label :issues_tracker, "Issues tracker", class: 'control-label'
  37 + .input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
37 38
38 - .clearfix  
39 - = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'  
40 - .input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id? 39 + .clearfix
  40 + = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
  41 + .input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id?
41 42
42 .clearfix 43 .clearfix
43 = f.label :merge_requests_enabled, "Merge Requests" 44 = f.label :merge_requests_enabled, "Merge Requests"
app/views/projects/_form.html.haml
  Diff comments   View file @cff8457
@@ -24,13 +24,14 @@ @@ -24,13 +24,14 @@
24 = f.check_box :issues_enabled 24 = f.check_box :issues_enabled
25 %span.descr Lightweight issue tracking system for this project 25 %span.descr Lightweight issue tracking system for this project
26 26
27 - .control-group  
28 - = f.label :issues_tracker, "Issues tracker", class: 'control-label'  
29 - .input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled }) 27 + - if Project.issues_tracker.values.count > 1
  28 + .control-group
  29 + = f.label :issues_tracker, "Issues tracker", class: 'control-label'
  30 + .input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
30 31
31 - .clearfix  
32 - = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'  
33 - .input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id? 32 + .clearfix
  33 + = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
  34 + .input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id?
34 35
35 .control-group 36 .control-group
36 = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' 37 = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'