features/projects/settings_member.feature @@ -35,6 +35,15 @@ module Settings render :new end end + + def update_all(member_function={}) + if Member.change_functions(member_function) + notice = "All members was updated" + else + notice = "You can't have no admin in a project" + end + redirect url(:project_settings_members, @project), :message => {:notice => notice} + end private app/controllers/settings/members.rb @@ -22,4 +22,27 @@ class Member user.login end + def self.change_functions(member_function) + return true if member_function.empty? + transaction do |txn| + project = nil + member_function.keys.each do |member_id| + member = Member.get!(member_id.to_i) + if project != member.project && !project.nil? + txn.rollback + return false + end + project = member.project + member.function = Function.get!(member_function[member_id].to_i) + member.save + end + project_have_admin = project.have_one_admin + if project_have_admin.is_a?(Array) && !project_have_admin.first + txn.rollback + return false + end + end + true + end + end app/models/member.rb @@ -4,14 +4,21 @@ = @project.name .inner - %table.table - %thead - %tr - %th.first User - %th.last Role - %tbody - - for member in @members - %tr{:class => cycle('odd', 'even')} - %td=link_to(member.user.login, url(:project_settings_member, @project, member)) - %td=member.function.name - %p=link_to 'Add member', url(:new_project_settings_member, @project) + + = form :action => resource(@project, :settings, :members, :update_all), :method => 'PUT', :class => 'form' do + + %table.table + %thead + %tr + %th.first User + %th.last Role + %tbody + - for member in @members + %tr{:class => cycle('odd', 'even')} + %td=link_to(member.user.login, url(:project_settings_member, @project, member)) + %td=select :name => "member_function[#{member.id}]", :collection => Function.all, :text_method => 'name', :value_method => 'id', :selected => member.function_id.to_s + .actions-bar + .actions + =link_to 'Add member', url(:new_project_settings_member, @project) + =submit "Update all", :class=> 'button' + .clear app/views/settings/members/index.html.haml @@ -52,7 +52,9 @@ Merb::Router.prepare do end namespace(:settings) do match('/').to(:controller => 'members', :action => 'index') - resources :members + resources :members do + collection :update_all, :method => :put + end end end # RESTful routes config/router.rb @@ -22,6 +22,24 @@ projects and tickets but can't update them. # Project settings +## Member of project + +In each project, you can choose all member. + +### Add member + +You can add several members to your project. A member add to this project, can +create and update all tickets. All functions are define by global administration. +There are only 2 differents roles. An admin role and a basic role. An admin can change +all settings of this projects and create/update milestone. + +### Change function to members + +in list of member, you can change all functions to members. If you change the select +and click on update all, all members are updated. The limitation is only to have +just one admin in each project. If you change all member's function to have no admin +the changement is rollback. + ## Delete project Since Oupsnow-0.4.0, you can delete a project. If you delete a project all doc/manual.markdown @@ -10,6 +10,10 @@ Then /^I should see an? (\w+) message$/ do |message_type| webrat_session.response.should have_xpath("//*[@class='#{message_type}']") end +Then /^I should see id (\w+)$/ do |id_txt| + webrat_session.response.should have_xpath("//*[@id='#{id_txt}']") +end + Then /^I should see (\d+) "(\w+)" tag with content "(\w+)"$/ do |num, tag_name, content| webrat_session.response.should have_selector(tag_name, :content => content, :count => num.to_i) end @@ -47,7 +51,7 @@ Given /^(\d+) tickets with state "([^\"]*)" on project "(.*)"$/ do |num, state_n project = Project.first(:name => project_name) project = Project.gen(:name => project_name) unless project num.to_i.times { - Ticket.gen(:state => state, + Ticket.gen(:state_id => state.id, :project_id => project.id) } end @@ -58,8 +62,54 @@ Given /^(\d+) tickets with state "([^\"]*)" and tag "([^\"]*)" on project "([^\" project = Project.first(:name => project_name) project = Project.gen(:name => project_name) unless project num.to_i.times { - Ticket.gen(:state => state, + Ticket.gen(:state_id => state.id, :project_id => project.id, :tag_list => tag_name) } end + +def user_with_name(name) + user = User.first(:login => name) + user = User.gen(:login => name) unless user + user +end + +def project_with_name(name) + project = Project.first(:name => name) + project = Project.gen(:name => name) unless project + project +end + +def function_with_name(name) + function = Function.first(:name => name) + function = Function.gen(:name => name, + :project_admin => (name == 'admin')) unless function + function +end + +Given /^I have user "([^\"]*)" with function "([^\"]*)" on project "([^\"]*)"$/ do |user_name, function_name, project_name| + user = user_with_name(user_name) + project = project_with_name(project_name) + function = function_with_name(function_name) + member = project.members.build(:user => user, :function => function) + member.save +end + +Given /^I have user "([^\"]*)" with function "([^\"]*)" on project "([^\"]*)" and no other user$/ do |user_name, function_name, project_name| + Given %{I have user "#{user_name}" with function "#{function_name}" on project "#{project_name}"} + + user = user_with_name(user_name) + project = project_with_name(project_name) + project.members.all(:user_id.not => user.id).each { |m| m.destroy } +end + +Then /^the member "([^\"]*)" has function "([^\"]*)" in project "([^\"]*)"$/ do |user_name, function_name, project_name| + User.first(:login => user_name).members.first(:project_id => Project.first(:name => project_name).id).function.name.should == function_name +end + +When /transaction commit/ do + transaction = DataMapper.repository(:default).adapter.pop_transaction + transaction.commit +end + + features/steps/result_steps.rb @@ -17,7 +17,12 @@ When /^I fill in "(.*)" with "(.*)"$/ do |field, value| @response = fill_in(field, :with => value) end -When /^I select "(.*)" from "(.*)"$/ do |value, field| +When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field| + @response = select(value, :from => field) +end + +When /^I select "([^\"]*)" from "member_function" of "([^\"]*)" from "([^\"]*)" project$/ do |value, user_name, project_name| + field = "member_function[#{User.first(:login => user_name).members.first(:project_id => Project.first(:name => project_name).id).id}]" @response = select(value, :from => field) end features/steps/webrat_steps.rb @@ -29,22 +29,23 @@ Function.fixture(:admin) {{ Project.fixture {{ :name => /\w+/.gen, :description => (0..3).of { /[:paragraph:]/.generate }.join("\n"), - :members => [:function => (Function.admin ? Function.admin : Function.gen(:admin)), - :user => (User.first(:login => 'admin') ? User.first(:login => 'admin') : User.gen(:admin))] + :members => [:function_id => (Function.admin ? Function.admin.id : Function.gen(:admin).id), + :user_id => (User.first(:login => 'admin') ? User.first(:login => 'admin').id : User.gen(:admin).id)] }} Member.fixture {{ - :user_id => User.first ? User.gen.id : User.first.id, - :project_id => (Project.first ? Project.gen.id : Project.first.id), - :function_id => (Function.first ? Function.gen.id : Function.first.id), + :user_id => (User.first ? User.first.id : User.gen!.id), + :project_id => (Project.first ? Project.first.id : Project.gen!.id), + :function_id => (Function.first ? Function.first.id : Function.gen.id), }} Ticket.fixture {{ :title => /\w+/.gen, :description => (0..3).of { /[:paragraph:]/.generate }.join("\n"), :tag_list => (1..2).of { /\w+/.generate }.join(','), - :project_id => (Project.first ? Project.gen.id : Project.first.id), - :member_create_id => User.first ? User.gen.id : User.first.id, + :project_id => (Project.first ? Project.first.id : Project.gen.id), + :member_create_id => User.first ? User.first.id : User.gen.id, + :state_id => State.first ? State.first.id : State.gen.id, }} State.fixture {{ @@ -63,8 +64,8 @@ Milestone.fixture {{ Event.fixture {{ :eventable_class => 'Ticket', - :eventable_id => (Ticket.first ? Ticket.gen.id : Ticket.first.id), + :eventable_id => (Ticket.first ? Ticket.first.id : Ticket.gen.id), :event_type => :created, - :user_id => User.first ? User.gen.id : User.first.id, - :project_id => (Project.first ? Project.gen.id : Project.first.id) + :user_id => User.first ? User.first.id : User.gen.id, + :project_id => (Project.first ? Project.first.id : Project.gen.id) }} spec/fixtures.rb @@ -3,7 +3,43 @@ require File.join( File.dirname(__FILE__), '..', "spec_helper" ) describe Member do it "should have dm-sweatshop valid" do - Member.make.should be_valid + Member.gen.should be_valid + end + + describe "self#change_functions" do + + it "should render true if no member_function send" do + Member.change_functions({}).should be_true + end + + it "should change member function" do + project = Project.gen + member = Member.gen!(:project_id => project.id) + transaction = DataMapper.repository(:default).adapter.pop_transaction + transaction.commit + Member.change_functions({member.id => Function.admin.id}).should be_true + member.reload.function.should == Function.admin + end + + it "should not change member function if this no admin in project" do + project = Project.gen + member_admin = project.members.first + member_admin.function.should be_project_admin + member = Member.gen!(:project_id => project.id, :user_id => User.gen.id) + project.reload + Function.gen! unless Function.not_admin # Need a function not admin + transaction = DataMapper.repository(:default).adapter.pop_transaction + transaction.commit + Member.change_functions({member_admin.id => Function.not_admin.id, + member.id => Function.not_admin.id}).should be_false + member_admin.reload.function.should be_project_admin + # Need delete all add before commit + Project.all.each {|pr| pr.destroy} + Member.all.each {|pr| pr.destroy} + project.destroy + member_admin.destroy + member.destroy + end end end spec/models/member_spec.rb f856336c92860cc24de18e980b4b6b5d132edc52 Cyril Mougel cyril.mougel@gmail.com http://github.com/shingara/oupsnow/commit/2ede3e12e483ba82394a8d8acb406274613e4bef 2ede3e12e483ba82394a8d8acb406274613e4bef 2009-06-11T00:36:35-07:00 2009-06-11T00:36:35-07:00 add availability to change function to each member of project see #17 cc32909eb898784593f57942d6e1fc9441a2c4f8 Cyril Mougel cyril.mougel@gmail.com