Download as
Browse Code »

Commit a8b544ed770cf172b09feb6ffee14b1814b66ad4

Authored by Yves Senn
2 parents e1ac3db9 1da67c2c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4519 from kwongius/team-assignment-text 

Fix header text for setting greatest team access to a project
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/admin/teams/projects/new.html.haml
  Diff comments   View file @a8b544e
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 .input 8 .input
9 = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' 9 = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
10 10
11 - %h6 Choose greatest user acces for your team in this projects: 11 + %h6 Choose greatest user access for your team in these projects:
12 .clearfix 12 .clearfix
13 = label_tag :greatest_project_access, "Greatest Access" 13 = label_tag :greatest_project_access, "Greatest Access"
14 .input 14 .input
app/views/projects/teams/available.html.haml
  Diff comments   View file @a8b544e
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .padded 10 .padded
11 = label_tag :team_id, "Team" 11 = label_tag :team_id, "Team"
12 .input= select_tag(:team_id, options_from_collection_for_select(@teams, :id, :name), prompt: "Select team", class: "chosen xxlarge", required: true) 12 .input= select_tag(:team_id, options_from_collection_for_select(@teams, :id, :name), prompt: "Select team", class: "chosen xxlarge", required: true)
13 - %p.slead Choose greatest user acces in team you want to assign: 13 + %p.slead Choose greatest user access for your team in this project:
14 .padded 14 .padded
15 = label_tag :team_ids, "Permission" 15 = label_tag :team_ids, "Permission"
16 .input= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" } 16 .input= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" }