Skip to content

Add support to shared versions when add or edit test plans #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gartz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support to shared versions when add or edit test plans #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f73b39b
Fix impasse_custom_fields_tabs bug
Oct 25, 2012
7a6930d
Added support to shared versions
Jun 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/impasse_test_plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def new
flash[:notice] = l(:notice_successful_create)
redirect_to :action => :tc_assign, :project_id => @project, :id => @test_plan
end
@versions = @project.versions
@versions = @project.shared_versions
end

def edit
Expand All @@ -35,7 +35,7 @@ def edit
flash[:notice] = l(:notice_successful_update)
redirect_to :action => :show, :project_id => @project, :id => @test_plan
end
@versions = @project.versions
@versions = @project.shared_versions
end

def destroy
Expand Down
26 changes: 14 additions & 12 deletions app/views/impasse_settings/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
</div>
<% unless @custom_fields_by_type.empty? %>
<fieldset class="box" id="impasse_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
<% impasse_custom_fields_tabs.each do |tab| %>
<% if @custom_fields_by_type[tab[:name]] %>
<h3><%= l(tab[:label])%></h3>
<div>
<% @custom_fields_by_type[tab[:name]].each do |custom_field| %>
<label class="floating">
<%= check_box_tag 'custom_field_ids[]', custom_field.id, (@impasse_custom_fields[tab[:name]].include? custom_field) %>
<%=h custom_field.name %>
</label>
<% end %>
<br class="clear"/>
</div>
<% unless @impasse_custom_fields_tabs.empty? %>
<% impasse_custom_fields_tabs.each do |tab| %>
<% if @custom_fields_by_type[tab[:name]] %>
<h3><%= l(tab[:label])%></h3>
<div>
<% @custom_fields_by_type[tab[:name]].each do |custom_field| %>
<label class="floating">
<%= check_box_tag 'custom_field_ids[]', custom_field.id, (@impasse_custom_fields[tab[:name]].include? custom_field) %>
<%=h custom_field.name %>
</label>
<% end %>
<br class="clear"/>
</div>
<% end %>
<% end %>
<% end %>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion app/views/impasse_test_plans/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p><%= form.text_area :notes, :rows => 10,
:class => 'wiki-edit' %></p>
<%= wikitoolbar_for 'test_plan_notes' %>
<p><%= form.select :version_id, @versions.collect{|v| [v.name, v.id]}, {:include_blank => false}, :required=>true%></p>
<p><%= form.select :version_id, @versions.collect{|v| [(@project != v.project ? v.project.name + ' - ' : '') + v.name, v.id]}, {:include_blank => false}, :required=>true%></p>
<% @test_plan.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :test_plan, value %></p>
<% end %>
Expand Down