home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Style page for project assign to team. Fix test for admin:teams

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-06-11 15:50:25 +03:00
parent 62a9bb5af7
commit 4daf68b57f
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/teams/projects/new.html.haml
+15 -20
View File
@@ -1,23 +1,18 @@
%h3.page_title
Team: #{@team.name}
%hr
= form_tag admin_team_projects_path(@team), id: "assign_projects", class: "bulk_import", method: :post do
%h6 Choose Projects you want to assign:
.clearfix
= label_tag :project_ids, "Projects"
.input
= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
%fieldset
%legend Projects (#{@team.projects.count})
= form_tag admin_team_projects_path(@team), id: "assign_projects", class: "bulk_import", method: :post do
%table#projects_list
%thead
%tr
%th Project name
%th Max access
%th
- @team.projects.each do |project|
%tr.project
%td
= link_to project.name_with_namespace, [:admin, project]
%td
%span= @team.human_max_project_access(project)
%td
%tr
%td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
%td= select_tag :greatest_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
%td= submit_tag 'Add', class: "btn btn-primary", id: :assign_projects_to_team
%h6 Choose greatest user acces for your team in this projects:
.clearfix
= label_tag :greatest_project_access, "Greatest Access"
.input
= select_tag :greatest_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
.form-actions
= submit_tag 'Add team to projects', class: "btn btn-create", id: :assign_projects_to_team
features/steps/admin/admin_teams.rb
+1 -1
View File
@@ -85,7 +85,7 @@ class AdminTeams < Spinach::FeatureSteps
end
Then 'I should see empty projects table' do
page.has_no_css?("#projects_list").must_equal true
page.should have_content "Projects (0)"
end
When 'I select project "Shop" with max access "Reporter"' do