[#4277] Only show project members for account executives.
This commit is contained in:
1 parent
0b0977a492
commit
c8ede6a05d
3 files changed
+7
-2
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
<% form.inputs do %>
|
<% form.inputs do %>
|
||||||
<%= form.input :name, :required => true %>
|
<%= form.input :name, :required => true %>
|
||||||
<%= form.input :account_executive, :required => true %>
|
<%= form.input :account_executive, :required => true, :collection => @project.users.sort %>
|
||||||
<li class="boolean optional">
|
<li class="boolean optional">
|
||||||
<%= label('contract', 'executed') %>
|
<%= label('contract', 'executed') %>
|
||||||
<%= check_box 'contract', 'executed' %>
|
<%= check_box 'contract', 'executed' %>
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ class ContractsEditTest < ActionController::IntegrationTest
|
|||||||
|
|
||||||
def setup
|
def setup
|
||||||
@project = Project.generate!(:identifier => 'main')
|
@project = Project.generate!(:identifier => 'main')
|
||||||
@contract = Contract.generate!(:project => @project, :name => 'A Contract', :payment_terms => 'net_15')
|
@account_executive = User.generate!
|
||||||
|
@role = Role.generate!
|
||||||
|
User.add_to_project(@account_executive, @project, @role)
|
||||||
|
@contract = Contract.generate!(:project => @project, :name => 'A Contract', :payment_terms => 'net_15', :account_executive => @account_executive)
|
||||||
end
|
end
|
||||||
|
|
||||||
should "allow any user to edit the contract" do
|
should "allow any user to edit the contract" do
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ class ContractsNewTest < ActionController::IntegrationTest
|
|||||||
|
|
||||||
should "create a new contract" do
|
should "create a new contract" do
|
||||||
@account_executive = User.generate!
|
@account_executive = User.generate!
|
||||||
|
@role = Role.generate!
|
||||||
|
User.add_to_project(@account_executive, @project, @role)
|
||||||
|
|
||||||
visit_contracts_for_project(@project)
|
visit_contracts_for_project(@project)
|
||||||
click_link 'New Contract'
|
click_link 'New Contract'
|
||||||
|
|||||||
Reference in new issue
Block a user