From db70372722f8f5e1c1a86d856cdcb5bf3c470303 Mon Sep 17 00:00:00 2001
From: Armindo Silva <deathon2legs@gmail.com>
Date: Tue, 9 Apr 2013 18:36:42 +0100
Subject: [PATCH 1/2] some labelled_tabular_form_for labels were unchanged and
 the plugin was not working

---
 app/views/impasse_custom_fields/edit.html.erb  | 2 +-
 app/views/impasse_custom_fields/new.html.erb   | 2 +-
 app/views/impasse_execution_bugs/_new.html.erb | 2 +-
 app/views/impasse_executions/_edit.html.erb    | 2 +-
 app/views/impasse_settings/_show.html.erb      | 2 +-
 app/views/impasse_test_case/_edit.html.erb     | 2 +-
 app/views/impasse_test_case/_new.html.erb      | 2 +-
 app/views/impasse_test_case/index.html.erb     | 4 ++--
 app/views/impasse_test_plans/copy.html.erb     | 2 +-
 app/views/impasse_test_plans/edit.html.erb     | 2 +-
 app/views/impasse_test_plans/new.html.erb      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/impasse_custom_fields/edit.html.erb b/app/views/impasse_custom_fields/edit.html.erb
index 4b6a20d..361ec0e 100644
--- a/app/views/impasse_custom_fields/edit.html.erb
+++ b/app/views/impasse_custom_fields/edit.html.erb
@@ -3,7 +3,7 @@
   &#187; <%= h @custom_field.name %></h2>
 
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :custom_field, @custom_field, { :action => :edit, :id => @custom_field } do |f| %>
+  <% labelled_form_for :custom_field, @custom_field, { :action => :edit, :id => @custom_field } do |f| %>
     <%= render :partial => "custom_fields/form", :locals => {:f => f} %>
   <%= hidden_field_tag 'type', @custom_field.type %>
     <%= submit_tag l(:button_save) %>
diff --git a/app/views/impasse_custom_fields/new.html.erb b/app/views/impasse_custom_fields/new.html.erb
index 9ab4a24..8035fdf 100644
--- a/app/views/impasse_custom_fields/new.html.erb
+++ b/app/views/impasse_custom_fields/new.html.erb
@@ -3,7 +3,7 @@
   &#187; <%= l(:label_custom_field_new) %></h2>
 
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :custom_field, @custom_field, {} do |f| %>
+  <% labelled_form_for :custom_field, @custom_field, {} do |f| %>
     <%= render :partial => "custom_fields/form", :locals => {:f => f} %>
   <%= hidden_field_tag 'type', @custom_field.type %>
     <%= submit_tag l(:button_create) %>
diff --git a/app/views/impasse_execution_bugs/_new.html.erb b/app/views/impasse_execution_bugs/_new.html.erb
index d0afa7a..e5bb9b8 100644
--- a/app/views/impasse_execution_bugs/_new.html.erb
+++ b/app/views/impasse_execution_bugs/_new.html.erb
@@ -1,6 +1,6 @@
 <div class="box">
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project},
+  <% labelled_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project},
                                :html => {:multipart => true, :id => 'issue-form', :class => 'tabular new-issue-form'} do |f| %>
     <%= error_messages_for 'issue' %>
     <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/impasse_executions/_edit.html.erb b/app/views/impasse_executions/_edit.html.erb
index c7e5a70..8b14bda 100644
--- a/app/views/impasse_executions/_edit.html.erb
+++ b/app/views/impasse_executions/_edit.html.erb
@@ -1,5 +1,5 @@
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :execution, @execution, {} do |f| %>
+  <% labelled_form_for :execution, @execution, {} do |f| %>
     <%= render :partial => "form", :locals => { :f => f } %>
   <% end %>
 <% else %>
diff --git a/app/views/impasse_settings/_show.html.erb b/app/views/impasse_settings/_show.html.erb
index e13056c..8400bdc 100644
--- a/app/views/impasse_settings/_show.html.erb
+++ b/app/views/impasse_settings/_show.html.erb
@@ -10,7 +10,7 @@
 
 %>
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :setting, @impasse_setting,
+  <% labelled_form_for :setting, @impasse_setting,
      :url => {:controller => :impasse_settings, :action => :edit, :project_id => @project }, 
      :lang => current_language do |f| %>
   <%= render :partial => 'impasse_settings/form', :locals => {:f => f } %>
diff --git a/app/views/impasse_test_case/_edit.html.erb b/app/views/impasse_test_case/_edit.html.erb
index fbc257c..1416c3f 100644
--- a/app/views/impasse_test_case/_edit.html.erb
+++ b/app/views/impasse_test_case/_edit.html.erb
@@ -1,5 +1,5 @@
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :test_case, @test_case, {} do |f| %>
+  <% labelled_form_for :test_case, @test_case, {} do |f| %>
     <%= render :partial => "form.#{params[:node_type]}", :locals => {:form => f} %>
     <button type="button" class="ui-button-submit"><%=l(:button_update)%></button>
     <button type="button" class="ui-button-cancel"><%=l(:button_cancel)%></button>
diff --git a/app/views/impasse_test_case/_new.html.erb b/app/views/impasse_test_case/_new.html.erb
index 22f563b..91694e1 100644
--- a/app/views/impasse_test_case/_new.html.erb
+++ b/app/views/impasse_test_case/_new.html.erb
@@ -1,5 +1,5 @@
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :test_case, @test_case, {} do |f| %>
+  <% labelled_form_for :test_case, @test_case, {} do |f| %>
     <%= render :partial => "form.#{params[:node_type]}", :locals => {:form => f} %>
     <button type="button" class="ui-button-submit"><%=l(:button_create)%></button>
     <button type="button" class="ui-button-cancel"><%=l(:button_cancel)%></button>
diff --git a/app/views/impasse_test_case/index.html.erb b/app/views/impasse_test_case/index.html.erb
index 1ba1df8..7933262 100644
--- a/app/views/impasse_test_case/index.html.erb
+++ b/app/views/impasse_test_case/index.html.erb
@@ -96,14 +96,14 @@
       <% if @allowed_projects.present? %>
 	<p><%=l(:notice_copy_cases_to_another_project)%></p>
 	<% if Rails::VERSION::MAJOR < 3 %>
-          <% labelled_tabular_form_for :copy_tests, @project, { :action => :copy_to_another_project } do |f| %>
+          <% labelled_form_for :copy_tests, @project, { :action => :copy_to_another_project } do |f| %>
 	    <p>
 	      <label for="dest_project_id"><%= l(:field_project) %></label>
 	      <%= select_tag('dest_project_id', project_tree_options_for_select(@allowed_projects, :selected => @target_project)) %>
 	    </p>
 	  <% end %>
 	<% else %>
-          <% output = labelled_tabular_form_for @project, :as => :copy_tests, :url => { :action => :copy_to_another_project } do |f| %>
+          <% output = labelled_form_for @project, :as => :copy_tests, :url => { :action => :copy_to_another_project } do |f| %>
 	    <p>
 	      <label for="dest_project_id"><%= l(:field_project) %></label>
 	      <%= select_tag('dest_project_id', project_tree_options_for_select(@allowed_projects, :selected => @target_project)) %>
diff --git a/app/views/impasse_test_plans/copy.html.erb b/app/views/impasse_test_plans/copy.html.erb
index 0c7a775..ec93dfa 100644
--- a/app/views/impasse_test_plans/copy.html.erb
+++ b/app/views/impasse_test_plans/copy.html.erb
@@ -3,7 +3,7 @@
     link_to(l(:label_test_plans_list), { :controller => :impasse_test_plans, :action => :index, :project_id => @project})
 ]%>
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :test_plan, @test_plan, {} do |f| %>
+  <% labelled_form_for :test_plan, @test_plan, {} do |f| %>
     <%= render :partial => "form", :locals => {:form => f} %>
     <%= submit_tag l(:button_create) %>
   <% end %>
diff --git a/app/views/impasse_test_plans/edit.html.erb b/app/views/impasse_test_plans/edit.html.erb
index 3dd2c47..3b74e6d 100644
--- a/app/views/impasse_test_plans/edit.html.erb
+++ b/app/views/impasse_test_plans/edit.html.erb
@@ -6,7 +6,7 @@
 
 <%= render_impasse_tabs %>
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :test_plan, @test_plan, {} do |f| %>
+  <% labelled_form_for :test_plan, @test_plan, {} do |f| %>
     <%= render :partial => "form", :locals => {:form => f} %>
     <%= submit_tag l(:button_update) %>
   <% end %>
diff --git a/app/views/impasse_test_plans/new.html.erb b/app/views/impasse_test_plans/new.html.erb
index ca8193b..f4c8d4f 100644
--- a/app/views/impasse_test_plans/new.html.erb
+++ b/app/views/impasse_test_plans/new.html.erb
@@ -1,5 +1,5 @@
 <% if Rails::VERSION::MAJOR < 3 %>
-  <% labelled_tabular_form_for :test_plan, @test_plan, {} do |f| %>
+  <% labelled_form_for :test_plan, @test_plan, {} do |f| %>
     <%= render :partial => "form", :locals => {:form => f} %>
     <%= submit_tag l(:button_create) %>
   <% end %>

From 3c9486e4d02ba554c02c38c7e0098173db2c9ad6 Mon Sep 17 00:00:00 2001
From: Armindo Silva <deathon2legs@gmail.com>
Date: Thu, 9 May 2013 11:57:22 +0100
Subject: [PATCH 2/2] for some unknown reason commit
 dbca8424e2479b6c05eff74c12b1625d7e6a0e60 was not imported from original repo

---
 app/views/impasse_settings/_form.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/impasse_settings/_form.html.erb b/app/views/impasse_settings/_form.html.erb
index 6827d1b..1b770d6 100644
--- a/app/views/impasse_settings/_form.html.erb
+++ b/app/views/impasse_settings/_form.html.erb
@@ -1,3 +1,4 @@
+<% self.class.send(:include, ImpasseSettingsHelper) -%> 
 <%= error_messages_for 'setting' %>
 <div class="box tabular">
   <p><%=f.select :bug_tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>