Merge branch 'feature/ui_import_form' into develop

2 files changed, 50 insertions, 22 deletions

diff --git a/app/assets/javascripts/import_tasks.coffee b/app/assets/javascripts/import_tasks.coffee
index b273bce8b..864288848 100644
--- a/app/assets/javascripts/import_tasks.coffee
+++ b/app/assets/javascripts/import_tasks.coffee
@@ -13,3 +13,25 @@ jQuery ->
     $(format_class + " #import_task_rule_parameter_set_id_input").toggle(  )
 
   $(check_input).change(import_check_change) for check_input in $('form input[name="import_task[no_save]"][type="checkbox"]')
+
+  $('[id$="_import_task_name"]').focusout ->
+    $this = $(this)
+    value = $this.val()
+    $('[id$="_import_task_name"]').each ->
+      if $(this) != $this
+        $(this).val value
+      return
+    return
+
+  $('[id$="_import_task_no_save"]').click ->
+    $('[id$="_import_task_no_save"]').prop 'checked', $(this).is(':checked')
+    return
+
+  $('[id$="_import_task_rule_parameter_set_id"]').focusout ->
+    $this = $(this)
+    value = $this.val()
+    $('[id$="_import_task_rule_parameter_set_id"]').each ->
+      if $(this) != $this
+        $(this).val value
+      return
+    return
diff --git a/app/views/import_tasks/new.html.erb b/app/views/import_tasks/new.html.erb
index d2581601b..303299f73 100644
--- a/app/views/import_tasks/new.html.erb
+++ b/app/views/import_tasks/new.html.erb
@@ -2,33 +2,39 @@
 
 <ul class="nav nav-pills">
   <% ImportTask.data_formats.each do |format| %>  
-  <li role="presentation"><a href="#<%= format %>" class='<%= @import_task.data_format == format ? "#{format} active" : "#{format}" %>' title='<%= t(:"enumerize.data_format_detail.#{format}")%>' data-toggle="tab"><%= t(:"enumerize.data_format.#{format}") %></a></li>
+    <li role="presentation">
+      <a href="#<%= format %>" class='<%= @import_task.data_format == format ? "#{format} active" : "#{format}" %>'
+                               title='<%= t(:"enumerize.data_format_detail.#{format}")%>'
+                               data-toggle="tab"><%= t(:"enumerize.data_format.#{format}") %>
+      </a>
+    </li>
   <% end %>
 </ul>
 
 <div class="tab-content">
-<% @available_imports.each do |import_task| %>
-  <%= semantic_form_for [@referential, import_task], :as => :import_task, :url => referential_import_tasks_path(@referential), :namespace => import_task.data_format ,:html => { :id => "#{import_task.data_format}", :class => "tab-pane highlight"} do |form| %>
-	<%= form.inputs do %>
-	  <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %>      <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %>
-	  <%= form.input :data_format, :as => :hidden %>
-	  <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %>	      
-          <%= form.input :name %>
-	  <%= form.input :no_save, :as => :boolean %>    
-	  <%= form.input :rule_parameter_set_id, :as => :select,
-        :collection =>  @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true %>
-	  <%= form.input :resources, :as => :file %>
-        <% end %>
-    
-        <%= render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } %>
-
-	<%= form.actions do %>
-	  <%= form.action :submit, :as => :button , :label => t( 'formtastic.import' ) %>
-	  <%= form.action :cancel, :as => :link %>
-	<% end %>
-
+  <% @available_imports.each do |import_task| %>
+    <%= semantic_form_for [@referential, import_task], :as => :import_task, :url => referential_import_tasks_path(@referential),
+                          :namespace => import_task.data_format, :html => { :id => "#{import_task.data_format}",
+                                                                            :class => "tab-pane highlight" } do |form| %>
+      <%= form.inputs do %>
+        <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %>
+        <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %>
+        <%= form.input :data_format, :as => :hidden %>
+        <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %>
+        <%= form.input :name %>
+        <%= form.input :no_save, :as => :boolean %>
+        <%= form.input :rule_parameter_set_id, :as => :select,
+                       :collection =>  @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] },
+                       :include_blank => true %>
+        <%= form.input :resources, :as => :file %>
+      <% end %>
+      <%= render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } %>
+      <%= form.actions do %>
+        <%= form.action :submit, :as => :button , :label => t( 'formtastic.import' ) %>
+        <%= form.action :cancel, :as => :link %>
+      <% end %>
+    <% end %>
   <% end %>
-<% end %>
 </div>
 
 <%= javascript_include_tag new_referential_import_task_path(@referential, :format => :js) %>